summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-01-09 09:28:20 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:09 +0000
commit8ac5e492baf0531a92a81ea06a9cdcf3acbcee69 (patch)
treee34d71f4ac663e85ca24f552de57b977a66b1a9d /meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
parent14800d736122e1d8aa88bd48624f4e8f57e4b0e0 (diff)
downloadpoky-8ac5e492baf0531a92a81ea06a9cdcf3acbcee69.tar.gz
nativesdk-icecc-toolchain: Use TARGET_PREFIX in post-relocate
The icecc setup for the SDK was broken in multilib configurations now that each multilib environment runs the post-relocate scripts separately. Including $TARGET_PREFIX in the icecc shim path and in the toolchain environment name prevents the various multilib setups from conflicting. [YOCTO #13128] (From OE-Core rev: 13704d7a9d147382169d0c4bd77cb4f5577c65b1) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb')
-rw-r--r--meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb b/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
index 9d2750e479..304ad7fec0 100644
--- a/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
+++ b/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
@@ -13,7 +13,7 @@ SRC_URI = "\
13 13
14inherit nativesdk 14inherit nativesdk
15 15
16ENV_NAME="${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TUNE_PKGARCH}-${DISTRO_VERSION}.tar.gz" 16ENV_NAME="${DISTRO}-${TCLIBC}-${SDK_ARCH}-@TARGET_PREFIX@${DISTRO_VERSION}.tar.gz"
17 17
18do_compile() { 18do_compile() {
19} 19}
@@ -24,12 +24,12 @@ do_install() {
24 install -d ${D}${SDKPATHNATIVE}/environment-setup.d/ 24 install -d ${D}${SDKPATHNATIVE}/environment-setup.d/
25 install -m 0644 ${WORKDIR}/icecc-env.sh ${D}${SDKPATHNATIVE}/environment-setup.d/ 25 install -m 0644 ${WORKDIR}/icecc-env.sh ${D}${SDKPATHNATIVE}/environment-setup.d/
26 sed -i ${D}${SDKPATHNATIVE}/environment-setup.d/icecc-env.sh \ 26 sed -i ${D}${SDKPATHNATIVE}/environment-setup.d/icecc-env.sh \
27 -e "s,@TOOLCHAIN_ENV@,${ENV_NAME},g" 27 -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g'
28 28
29 install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ 29 install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
30 install -m 0755 ${WORKDIR}/icecc-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ 30 install -m 0755 ${WORKDIR}/icecc-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
31 sed -i ${D}${SDKPATHNATIVE}/post-relocate-setup.d/icecc-setup.sh \ 31 sed -i ${D}${SDKPATHNATIVE}/post-relocate-setup.d/icecc-setup.sh \
32 -e "s,@TOOLCHAIN_ENV@,${ENV_NAME},g" 32 -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g'
33} 33}
34 34
35PACKAGES = "${PN}" 35PACKAGES = "${PN}"