+DISTCC=
if [[ $USE_DISTCC != off ]] &&
- [[ "$DISTCC_HOSTS" ]] &&
- test -x /usr/bin/distcc ; then
-
- DISTCC=/usr/bin/distcc
-
+ [[ "$DISTCC_HOSTS" ]]; then
+ if [ -x /usr/bin/icecc ]; then
+ DISTCC=/usr/bin/icecc
+ elif [ -x /usr/bin/distcc ]; then
+ DISTCC=/usr/bin/distcc
+ fi
export DISTCC_HOSTS
export DISTCC_DIR
export DISTCC_VERBOSE=0
export DISTCC_LOG=/dev/null
-
- test -d "$DISTCC_DIR/" || mkdir -p "$DISTCC_DIR"
-else
- DISTCC=""
+ mkdir -p "$DISTCC_DIR"
fi
if [ "$CCACHE" = "on" ] && [ -x /usr/bin/ccache ] ; then
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 6e7e88d..30be820 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -1107,8 +1107,10 @@ invoke_build_dir() {
USE_DISTCC=off
if [[ $DISABLE_DISTCC != yes ]] ; then
- if test -n "$DISTCC_HOSTS" && spell_ok distcc ; then
- USE_DISTCC=on
+ if test -n "$DISTCC_HOSTS"; then
+ if spell_ok icecream || spell_ok distcc; then
+ USE_DISTCC=on
+ fi
fi
fi
[SM-Commit] GIT changes to master sorcery by Ismael Luceno (d0e9a15bbc692554c6425ba8a51f3c01340459f3),
Ismael Luceno, 07/20/2023