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-setup.sh | |
| parent | d065c592977ad742515121e07ed3b7698db55f25 (diff) | |
| download | openembedded-core-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-setup.sh')
| -rw-r--r-- | meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh index 25250b7c0e..fbd9f038b8 100644 --- a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh +++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh @@ -32,7 +32,7 @@ mkdir -p "`dirname $ICECC_VERSION`" icecc-create-env $ICECC $ICECXX $ICEAS $ICECC_VERSION || exit $? # Create symbolic links -d="$OECORE_NATIVE_SYSROOT/usr/share/icecream/bin" +d="$OECORE_NATIVE_SYSROOT/usr/share/${TARGET_PREFIX}icecream/bin" mkdir -p "$d" -ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}gcc" -ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}g++" +ln -sf "$ICECC_PATH" "$d/${CROSS_COMPILE}gcc" +ln -sf "$ICECC_PATH" "$d/${CROSS_COMPILE}g++" |