From 8ac5e492baf0531a92a81ea06a9cdcf3acbcee69 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 9 Jan 2019 09:28:20 -0600 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb') 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 = "\ inherit nativesdk -ENV_NAME="${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TUNE_PKGARCH}-${DISTRO_VERSION}.tar.gz" +ENV_NAME="${DISTRO}-${TCLIBC}-${SDK_ARCH}-@TARGET_PREFIX@${DISTRO_VERSION}.tar.gz" do_compile() { } @@ -24,12 +24,12 @@ do_install() { install -d ${D}${SDKPATHNATIVE}/environment-setup.d/ install -m 0644 ${WORKDIR}/icecc-env.sh ${D}${SDKPATHNATIVE}/environment-setup.d/ sed -i ${D}${SDKPATHNATIVE}/environment-setup.d/icecc-env.sh \ - -e "s,@TOOLCHAIN_ENV@,${ENV_NAME},g" + -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ install -m 0755 ${WORKDIR}/icecc-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ sed -i ${D}${SDKPATHNATIVE}/post-relocate-setup.d/icecc-setup.sh \ - -e "s,@TOOLCHAIN_ENV@,${ENV_NAME},g" + -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' } PACKAGES = "${PN}" -- cgit v1.2.3-54-g00ecf