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:39:09 +0000 |
commit | 8ac5e492baf0531a92a81ea06a9cdcf3acbcee69 (patch) | |
tree | e34d71f4ac663e85ca24f552de57b977a66b1a9d /meta/recipes-devtools/icecc-toolchain/icecc-toolchain | |
parent | 14800d736122e1d8aa88bd48624f4e8f57e4b0e0 (diff) | |
download | poky-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/icecc-toolchain')
-rw-r--r-- | meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh | 6 |
2 files changed, 5 insertions, 5 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 | |||
38 | CXXFLAGS="$CXXFLAGS -fno-diagnostics-show-caret" | 38 | CXXFLAGS="$CXXFLAGS -fno-diagnostics-show-caret" |
39 | fi | 39 | fi |
40 | export ICECC_PATH ICECC_CARET_WORKAROUND | 40 | export ICECC_PATH ICECC_CARET_WORKAROUND |
41 | export ICECC_VERSION="$OECORE_NATIVE_SYSROOT/usr/share/icecream/@TOOLCHAIN_ENV@" | 41 | export ICECC_VERSION="$(echo "$OECORE_NATIVE_SYSROOT/usr/share/${TARGET_PREFIX}icecream/@TOOLCHAIN_ENV@" | sed "s,@TARGET_PREFIX@,$TARGET_PREFIX,g")" |
42 | export ICECC="$(which ${CROSS_COMPILE}gcc)" | 42 | export ICECC="$(which ${CROSS_COMPILE}gcc)" |
43 | export ICECXX="$(which ${CROSS_COMPILE}g++)" | 43 | export ICECXX="$(which ${CROSS_COMPILE}g++)" |
44 | export ICEAS="$(which ${CROSS_COMPILE}as)" | 44 | export ICEAS="$(which ${CROSS_COMPILE}as)" |
45 | export PATH="$OECORE_NATIVE_SYSROOT/usr/share/icecream/bin:$PATH" | 45 | export PATH="$OECORE_NATIVE_SYSROOT/usr/share/${TARGET_PREFIX}icecream/bin:$PATH" |
46 | else | 46 | else |
47 | echo "Icecc not found. Disabling distributed compiling" | 47 | echo "Icecc not found. Disabling distributed compiling" |
48 | fi | 48 | fi |
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`" | |||
32 | icecc-create-env $ICECC $ICECXX $ICEAS $ICECC_VERSION || exit $? | 32 | icecc-create-env $ICECC $ICECXX $ICEAS $ICECC_VERSION || exit $? |
33 | 33 | ||
34 | # Create symbolic links | 34 | # Create symbolic links |
35 | d="$OECORE_NATIVE_SYSROOT/usr/share/icecream/bin" | 35 | d="$OECORE_NATIVE_SYSROOT/usr/share/${TARGET_PREFIX}icecream/bin" |
36 | mkdir -p "$d" | 36 | mkdir -p "$d" |
37 | ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}gcc" | 37 | ln -sf "$ICECC_PATH" "$d/${CROSS_COMPILE}gcc" |
38 | ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}g++" | 38 | ln -sf "$ICECC_PATH" "$d/${CROSS_COMPILE}g++" |