mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

nativesdk-icecc-toolchain: Use TARGET_PREFIX in post-relocate

Browse Source 
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>
This commit is contained in:
Joshua Watt
2019-01-09 09:28:20 -06:00
committed by Richard Purdie
parent 14800d7361
commit 8ac5e492ba
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
View File

@@ -38,11 +38,11 @@ if [ -n "$ICECC_PATH" ]; then
CXXFLAGS="$CXXFLAGS -fno-diagnostics-show-caret" CXXFLAGS="$CXXFLAGS -fno-diagnostics-show-caret"
fi fi
export ICECC_PATH ICECC_CARET_WORKAROUND 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 ICECC="$(which ${CROSS_COMPILE}gcc)"
export ICECXX="$(which ${CROSS_COMPILE}g++)" export ICECXX="$(which ${CROSS_COMPILE}g++)"
export ICEAS="$(which ${CROSS_COMPILE}as)" 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 else
echo "Icecc not found. Disabling distributed compiling" echo "Icecc not found. Disabling distributed compiling"
fi fi

6
meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
View File

@@ -32,7 +32,7 @@ mkdir -p "`dirname $ICECC_VERSION`"
icecc-create-env $ICECC $ICECXX $ICEAS $ICECC_VERSION || exit $? icecc-create-env $ICECC $ICECXX $ICEAS $ICECC_VERSION || exit $?
# Create symbolic links # Create symbolic links
d="$OECORE_NATIVE_SYSROOT/usr/share/icecream/bin" d="$OECORE_NATIVE_SYSROOT/usr/share/${TARGET_PREFIX}icecream/bin"
mkdir -p "$d" mkdir -p "$d"
ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}gcc" ln -sf "$ICECC_PATH" "$d/${CROSS_COMPILE}gcc"
ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}g++" ln -sf "$ICECC_PATH" "$d/${CROSS_COMPILE}g++"

6
meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
View File

@@ -13,7 +13,7 @@ SRC_URI = "\
inherit nativesdk 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() { do_compile() {
} }
@@ -24,12 +24,12 @@ do_install() {
install -d ${D}${SDKPATHNATIVE}/environment-setup.d/ install -d ${D}${SDKPATHNATIVE}/environment-setup.d/
install -m 0644 ${WORKDIR}/icecc-env.sh ${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 \ 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 -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
install -m 0755 ${WORKDIR}/icecc-setup.sh ${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 \ 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}" PACKAGES = "${PN}"