aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-02-22 09:14:06 +0000
committerTom Rini <tom_rini@mentor.com>2011-02-22 09:49:01 -0700
commit9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc (patch)
treefeb9cd117953f7bb537612f1a9c7f631b44d2990 /conf
parent1f71b10332f7ed50ee3ff0be73ede37e5e441c0a (diff)
downloadopenembedded-9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc.tar.gz
openembedded-9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc.tar.bz2
openembedded-9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc.zip
bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS
This is based on poky's ba2e1f4d933c37b372d6749d64614f2510ee9d7b, which simplifies TARGET_CPPFLAGS (and thus CFLAGS) and TARGET_LDFLAGS based on gcc any company having --sysroot Acked-by:Khem Raj <raj.khem@gmail.com> Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f005658c48..ec20332d5d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -502,7 +502,7 @@ PATCHRESOLVE = 'noop'
export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
+export TARGET_CPPFLAGS = ""
export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${includedir} -isystem${STAGING_DIR_HOST}${includedir}"
export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
@@ -520,7 +520,7 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
-Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = '${@["-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} -Wl,-O1 ${TARGET_LINK_HASH_STYLE}", "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == "yes"]}'
+export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${libdir} \
-Wl,-rpath-link,${STAGING_DIR_SDK}${libdir} \