~sourcemage/sorcery

d0e9a15bbc692554c6425ba8a51f3c01340459f3 — Ismael Luceno 9 months ago b1af102
Add support for icecream
2 files changed, 12 insertions(+), 11 deletions(-)

M var/lib/sorcery/build/run_compiler
M var/lib/sorcery/modules/libsorcery
M var/lib/sorcery/build/run_compiler => var/lib/sorcery/build/run_compiler +8 -9
@@ 19,20 19,19 @@

. /etc/sorcery/compile_config

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

M var/lib/sorcery/modules/libsorcery => var/lib/sorcery/modules/libsorcery +4 -2
@@ 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