mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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
This commit is contained in:
@@ -6,15 +6,16 @@ OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
|
|||||||
PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
|
PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
|
||||||
|
|
||||||
HOST_ARCH = "${BUILD_ARCH}"
|
HOST_ARCH = "${BUILD_ARCH}"
|
||||||
HOST_VENDOR = "${BUILD_VENDOR}"
|
HOST_VENDOR = "${TARGET_VENDOR}"
|
||||||
HOST_OS = "${BUILD_OS}"
|
HOST_OS = "${BUILD_OS}"
|
||||||
HOST_PREFIX = "${BUILD_PREFIX}"
|
HOST_PREFIX = "${BUILD_PREFIX}"
|
||||||
HOST_CC_ARCH = "${BUILD_CC_ARCH}"
|
HOST_CC_ARCH = "${BUILD_CC_ARCH}"
|
||||||
|
#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}"
|
||||||
|
|
||||||
CPPFLAGS = "${BUILD_CPPFLAGS}"
|
CPPFLAGS = "${BUILD_CPPFLAGS}"
|
||||||
CFLAGS = "${BUILD_CFLAGS}"
|
CFLAGS = "${BUILD_CFLAGS}"
|
||||||
CXXFLAGS = "${BUILD_CFLAGS}"
|
CXXFLAGS = "${BUILD_CFLAGS}"
|
||||||
LDFLAGS = "${BUILD_LDFLAGS}"
|
LDFLAGS = "${BUILDSDK_LDFLAGS}"
|
||||||
|
|
||||||
# Path prefixes
|
# Path prefixes
|
||||||
prefix = "${SDK_PREFIX}"
|
prefix = "${SDK_PREFIX}"
|
||||||
|
|||||||
@@ -368,6 +368,11 @@ export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
|
|||||||
export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
|
export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
|
||||||
-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
|
-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
|
||||||
-Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
|
-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 LDFLAGS = "${TARGET_LDFLAGS}"
|
||||||
export TARGET_LDFLAGS = "-Wl,-O1"
|
export TARGET_LDFLAGS = "-Wl,-O1"
|
||||||
#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
|
#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
|
||||||
|
|||||||
Reference in New Issue
Block a user