[oe-commits] Tom Rini : bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS

[git version control]

Module: openembedded.git
Branch: trini/simplify-target-flags
Commit: 828dfbc602a3944ee5e94fb84918402b44e091e0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=828dfbc602a3944ee5e94fb84918402b44e091e0

Author: Tom Rini <tom_rini at mentor.com>
Date:   Thu Feb 17 13:25:25 2011 -0700

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

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 conf/bitbake.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f005658..ec20332 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} \