diff options
| author |   Joshua Watt <jpewhacker@gmail.com> | 2019-01-09 09:28:20 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-11 10:38:21 +0000 |
| commit | 13704d7a9d147382169d0c4bd77cb4f5577c65b1 (patch) | |
| tree | 773f0bcddded060b22d9e8d161d912beb6636cb7 /meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb | |
| parent | d065c592977ad742515121e07ed3b7698db55f25 (diff) | |
| download | openembedded-core-contrib-13704d7a9d147382169d0c4bd77cb4f5577c65b1.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]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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.bb | 6 |
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 = "\ 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}" |