summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-23 10:04:14 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-23 10:04:14 +0000
commite50291290b0b2a2fa3698d35750546b80a5c9fea (patch)
treeaa18f368585af119a6dc62e9a833da2db8e1ff0b /meta/conf
parentaf489dd9e2983777fa051c7931a8d2770af0461c (diff)
downloadopenembedded-core-e50291290b0b2a2fa3698d35750546b80a5c9fea.tar.gz
openembedded-core-e50291290b0b2a2fa3698d35750546b80a5c9fea.tar.bz2
openembedded-core-e50291290b0b2a2fa3698d35750546b80a5c9fea.tar.xz
openembedded-core-e50291290b0b2a2fa3698d35750546b80a5c9fea.zip
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
Diffstat (limited to 'meta/conf')
-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}"