X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-target-contrib.sh;h=96ea6102da3c70b096e225b500b47867c27bbec6;hb=a02f0965d8da367bbf739dc8a7cb8628210d3cf1;hp=3095bc4868a2d5d7909992c93974462c54f7c6cd;hpb=63f5fdcb4b0450ad85cc41e867710304c044ff32;p=sbcl.git

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 3095bc4..96ea610 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -13,6 +13,9 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
+. ./find-gnumake.sh
+find_gnumake
+
 # usually SBCL_HOME refers to the installed root of SBCL, not the
 # build directory.  Right now, however, where there are dependencies
 # between contrib packages, we want the _uninstalled_ versions to be
@@ -24,7 +27,14 @@ SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
-gnumake=${GNUMAKE:-gmake}
+# deleting things here lets us not worry about interaction with stale
+# fasls.  This is not good, but is better than :FORCE on each asdf
+# operation, because that causes multiple builds of base systems such
+# as SB-RT and SB-GROVEL, but FIXME: there's probably a better
+# solution.  -- CSR, 2003-05-30
+
+find contrib/ \( -name '*.fasl' -o -name 'foo.c' -o -name 'a.out' -o -name 'alien.so' -o -name '*.o' \) \
+  -print | xargs rm -f
 
 mkdir -p contrib/systems
 rm -f contrib/systems/*
@@ -37,5 +47,5 @@ for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
     test -f $i/test-passed && rm $i/test-passed 
-    $gnumake -C $i test && touch $i/test-passed
+    $GNUMAKE -C $i test && touch $i/test-passed
 done