diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-10-29 21:41:08 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-10-29 21:41:08 +0000 |
| commit | 849311c8df9f69842e5387852b68c6a4a593fcef (patch) | |
| tree | c37da0a4795ad4878394b024d95e0bffd2ef6fa3 /meta | |
| parent | 454311f20fa637d059ddecd583784478822470d4 (diff) | |
| download | poky-849311c8df9f69842e5387852b68c6a4a593fcef.tar.gz | |
bitbake.conf: Remove more hardcoded staging layout
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3031 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/bitbake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8acc95f9b3..e5948e6df8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -334,7 +334,7 @@ PATCHRESOLVE = 'user' | |||
| 334 | 334 | ||
| 335 | export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" | 335 | export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" |
| 336 | export CPPFLAGS = "${TARGET_CPPFLAGS}" | 336 | export CPPFLAGS = "${TARGET_CPPFLAGS}" |
| 337 | export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include" | 337 | export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}" |
| 338 | 338 | ||
| 339 | export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" | 339 | export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" |
| 340 | export CFLAGS = "${TARGET_CFLAGS}" | 340 | export CFLAGS = "${TARGET_CFLAGS}" |
| @@ -348,8 +348,8 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ | |||
| 348 | -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ | 348 | -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ |
| 349 | -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" | 349 | -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" |
| 350 | export LDFLAGS = "${TARGET_LDFLAGS}" | 350 | export LDFLAGS = "${TARGET_LDFLAGS}" |
| 351 | export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \ | 351 | export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ |
| 352 | -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \ | 352 | -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \ |
| 353 | -Wl,-O1" | 353 | -Wl,-O1" |
| 354 | 354 | ||
| 355 | # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? | 355 | # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? |