summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/distro/include/poky-external.inc1
2 files changed, 1 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 31e3e2979..342c174e7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -343,9 +343,7 @@ export TARGET_CPPFLAGS = ""
export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
export CFLAGS = "${TARGET_CFLAGS}"
-# Double spaces in CFLAGS upsets gdb...
-#export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
-export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION}"
+export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive"
export CXXFLAGS = "${TARGET_CXXFLAGS}"
diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc
index 50b250bce..bda113418 100644
--- a/meta/conf/distro/include/poky-external.inc
+++ b/meta/conf/distro/include/poky-external.inc
@@ -25,6 +25,5 @@ PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain"
TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
-TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"