changeset 488:2a028ba323bb

If distccd is installed on the host, link it into build/host so we don't rebuild it on a second host-tools.sh run with the trimmed $PATH.
author Rob Landley <rob@landley.net>
date Mon, 17 Nov 2008 03:01:53 -0600
parents 1828f3fe831e
children c65c82d85fea
files host-tools.sh
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/host-tools.sh	Sun Nov 16 23:22:52 2008 -0600
+++ b/host-tools.sh	Mon Nov 17 03:01:53 2008 -0600
@@ -143,15 +143,20 @@
 # use the distcc acceleration trick.
 
 # Build distcc (if it's not in $PATH)
-if [ -z "$(which distcc)" ] && [ ! -f "{$HOSTTOOLS}"/distcc ]
+if [ ! -f "${HOSTTOOLS}"/distccd ]
 then
-  setupfor distcc &&
-  ./configure --with-included-popt &&
-  make -j "$CPUS" &&
-  cp distcc distccd "${HOSTTOOLS}" &&
-  cd ..
+  if [ -z "$(which distccd)" ]
+  then
+    setupfor distcc &&
+    ./configure --with-included-popt &&
+    make -j "$CPUS" &&
+    cp distcc distccd "${HOSTTOOLS}" &&
+    cd ..
 
-  cleanup distcc
+    cleanup distcc
+  else
+    ln -s "$(which distccd)" "${HOSTTOOLS}"/distccd
+  fi
 fi
 
 # Everything after here is stuff we _could_ build, but currently don't.