aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Cordero <catalyst@0xdc.io>2021-02-04 11:07:21 +0000
committerMatt Turner <mattst88@gentoo.org>2021-02-20 21:05:44 -0500
commit42332a642def9a8d454246da68955172442e7aa5 (patch)
tree8081097e62c7095afe85a5a27f80100a84b84a8c
parentcatalyst: Remove /etc/machine-id in all stages (diff)
downloadcatalyst-master.tar.gz
catalyst-master.tar.bz2
catalyst-master.zip
targets: Use the correct distcc libdirHEADmaster
Since distcc-3.3 (and bug 651030) distcc symlinks have been installed to /usr/lib/distcc/bin/ regardless of get_libdir. Signed-off-by: Daniel Cordero <catalyst@0xdc.io> Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rwxr-xr-xtargets/support/chroot-functions.sh16
1 files changed, 7 insertions, 9 deletions
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 88465c3..d8472d4 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -83,11 +83,10 @@ setup_features() {
# This sets up automatic cross-distcc-fu according to
# https://wiki.gentoo.org/wiki/Distcc/Cross-Compiling
CHOST=$(portageq envvar CHOST)
- LIBDIR=$(get_libdir)
- cd /usr/${LIBDIR}/distcc/bin
+ cd /usr/lib/distcc/bin
rm cc gcc g++ c++ 2>/dev/null
- echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
- chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper
+ echo -e '#!/bin/bash\nexec /usr/lib/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
+ chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
fi
@@ -171,13 +170,12 @@ setup_gcc(){
}
cleanup_distcc() {
- LIBDIR=$(get_libdir)
- rm -rf /etc/distcc/hosts
+ rm -f /etc/distcc/hosts
for i in cc gcc c++ g++; do
- rm -f /usr/${LIBDIR}/distcc/bin/${i}
- ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i}
+ rm -f /usr/lib/distcc/bin/${i}
+ ln -s /usr/bin/distcc /usr/lib/distcc/bin/${i}
done
- rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper
+ rm -f /usr/lib/distcc/bin/*-wrapper
}
cleanup_icecream() {