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/icecc-toolchain/icecc-env.sh | |
| 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/icecc-toolchain/icecc-env.sh')
| -rw-r--r-- | meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh index 94760076bf..81b3018bb6 100644 --- a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh +++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh @@ -38,11 +38,11 @@ if [ -n "$ICECC_PATH" ]; then CXXFLAGS="$CXXFLAGS -fno-diagnostics-show-caret" fi export ICECC_PATH ICECC_CARET_WORKAROUND - export ICECC_VERSION="$OECORE_NATIVE_SYSROOT/usr/share/icecream/@TOOLCHAIN_ENV@" + export ICECC_VERSION="$(echo "$OECORE_NATIVE_SYSROOT/usr/share/${TARGET_PREFIX}icecream/@TOOLCHAIN_ENV@" | sed "s,@TARGET_PREFIX@,$TARGET_PREFIX,g")" export ICECC="$(which ${CROSS_COMPILE}gcc)" export ICECXX="$(which ${CROSS_COMPILE}g++)" export ICEAS="$(which ${CROSS_COMPILE}as)" - export PATH="$OECORE_NATIVE_SYSROOT/usr/share/icecream/bin:$PATH" + export PATH="$OECORE_NATIVE_SYSROOT/usr/share/${TARGET_PREFIX}icecream/bin:$PATH" else echo "Icecc not found. Disabling distributed compiling" fi |