From e50291290b0b2a2fa3698d35750546b80a5c9fea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 23 Nov 2007 10:04:14 +0000 Subject: 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 --- meta/conf/bitbake.conf | 4 +--- meta/conf/distro/include/poky-external.inc | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/conf') 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}" -- cgit v1.2.3