diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-01-17 10:40:36 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-01-17 10:40:36 +0000 |
| commit | 70dc1470118bb4afd39fe2efb031eb2a7080dac6 (patch) | |
| tree | 9905c9ee1958ca74039a913565a775b332f1cb81 | |
| parent | 551ae761ebd098ebec45253d5474e297dea0ea01 (diff) | |
| download | openembedded-core-70dc1470118bb4afd39fe2efb031eb2a7080dac6.tar.gz openembedded-core-70dc1470118bb4afd39fe2efb031eb2a7080dac6.tar.bz2 openembedded-core-70dc1470118bb4afd39fe2efb031eb2a7080dac6.zip | |
sdk.bbclass: Set rpath correctly for sdk binaries and use the target prefix to ensure sdk and native staging don't mix.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3501 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/sdk.bbclass | 5 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 63f12117eb..d6aca0fccd 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -6,15 +6,16 @@ OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" HOST_ARCH = "${BUILD_ARCH}" -HOST_VENDOR = "${BUILD_VENDOR}" +HOST_VENDOR = "${TARGET_VENDOR}" HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" +#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" -LDFLAGS = "${BUILD_LDFLAGS}" +LDFLAGS = "${BUILDSDK_LDFLAGS}" # Path prefixes prefix = "${SDK_PREFIX}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 75a69f6dac..e392395d68 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -368,6 +368,11 @@ export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive" export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" + +BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \ + -Wl,-rpath-link,${STAGING_LIBDIR} \ + -Wl,-rpath,${libdir} -Wl,-O1" + export LDFLAGS = "${TARGET_LDFLAGS}" export TARGET_LDFLAGS = "-Wl,-O1" #export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ |