From 849311c8df9f69842e5387852b68c6a4a593fcef Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 29 Oct 2007 21:41:08 +0000 Subject: bitbake.conf: Remove more hardcoded staging layout git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3031 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/bitbake.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/conf/bitbake.conf') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8acc95f9b..e5948e6df 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -334,7 +334,7 @@ PATCHRESOLVE = 'user' export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" export CPPFLAGS = "${TARGET_CPPFLAGS}" -export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include" +export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" export CFLAGS = "${TARGET_CFLAGS}" @@ -348,8 +348,8 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \ - -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \ +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \ -Wl,-O1" # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? -- cgit v1.2.3