bitbake.conf/poky-external.inc: Clean up CFLAGS handling

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3211 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 31e3e2979bca8716b097059e7abd3f363a3c0141..342c174e71135984b8bc8cd197261cd139645f3e 100644 (file)
--- 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 50b250bceef63dd9ea4f1ef60099a5ef2846a0ed..bda1134182e2d937baf635225ebf0f959101aac8 100644 (file)
--- 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}"