From 98d114f26a2b2dc83c4495213c295d13da9240df Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Mon, 3 Oct 2022 12:44:45 -0400
Subject: [PATCH] Simplify install.sh

Don't look at asdf-cache to decide whether each contrib was built.
Just copy the entirety of contrib/ in one "cp" command.
---
 contrib/Makefile       |  6 ++----
 contrib/asdf-module.mk |  3 ---
 install.sh             | 17 ++---------------
 make-target-contrib.sh |  3 ---
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/contrib/Makefile b/contrib/Makefile
index 3d85ffbee..018a3f1d6 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -21,11 +21,9 @@ sb-simple-streams.fasl: sb-posix.fasl sb-bsd-sockets.fasl
 sb-grovel.fasl: asdf.fasl # for building the module, not for our build
 
 # Notes:
-# 1. Not sure if we still need mkdir asdf-cache. Nothing goes there.
-# 2. Invoking $(MAKE) for nested make eliminates a warning about jobserver mode.
-# 3. This could be made to 'tee' into output/building-contrib as it used to,
+# 1. Invoking $(MAKE) for nested make eliminates a warning about jobserver mode.
+# 2. This could be made to 'tee' into output/{something} as it used to,
 #    but it would be more Lispy if not elegant to have 'make-contrib.lisp' bind
 #    *ERROR-OUTPUT* to a broadcast stream of SYS:*STDERR* and a file stream.
 %.fasl:
-	mkdir -p ../obj/asdf-cache/$(basename $(@F))
 	$(MAKE) MODULE_REQUIRES="$^" -C $(basename $(@F)) </dev/null 2>&1
diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index c034a4878..994cbcbd8 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -31,6 +31,3 @@ all: $(FASL)
 
 $(FASL):: # this produces $(ASD) as a side-effect
 	$(SBCL)	--load ../make-contrib.lisp "$(SYSTEM)" $(MODULE_REQUIRES)
-
-install:
-	cp $(FASL) $(ASD) "$(BUILD_ROOT)$(INSTALL_DIR)"
diff --git a/install.sh b/install.sh
index bfd56ca11..52bd2048c 100755
--- a/install.sh
+++ b/install.sh
@@ -123,21 +123,8 @@ done
 
 # installing contrib
 
-# See make-target-contrib.sh for this variable.
-SBCL_TOP="../../"
-
-SBCL="$SBCL_TOP/src/runtime/sbcl --noinform --core $SBCL_TOP/output/sbcl.core --no-userinit --no-sysinit --disable-debugger"
-export SBCL SBCL_TOP
-
-. ./find-gnumake.sh
-find_gnumake
-
-for i in `cd obj/asdf-cache ; echo *`; do
-    test -d obj/asdf-cache/$i && test -f obj/sbcl-home/contrib/$i.fasl || continue;
-    INSTALL_DIR="$SBCL_HOME/contrib/"
-    export INSTALL_DIR
-    ensure_dirs "$BUILD_ROOT$INSTALL_DIR" && $GNUMAKE -C contrib/$i install < /dev/null
-done
+ensure_dirs "$BUILD_ROOT$SBCL_HOME/contrib/"
+cp obj/sbcl-home/contrib/* "$BUILD_ROOT$SBCL_HOME/contrib/"
 
 echo
 echo "SBCL has been installed:"
diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 2f3ef345c..594010e97 100755
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -56,11 +56,8 @@ SBCL="$SBCL_TOP/src/runtime/sbcl --noinform --core $SBCL_TOP/output/sbcl.core \
 if [ -z "$DONT_CLEAN_SBCL_CONTRIB" ] ; then
   rm -rf obj/from-xc/contrib/
   rm -fr obj/sbcl-home/contrib/
-  rm -fr obj/asdf-cache/
 fi
 
-find output -name 'building-contrib.*' -print | xargs rm -f
-
 set -e # exit with failure if any $GNUMAKE fails
 # Ignore all source registries.
 if [ -z "$*" ]; then