Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1:/tmp/cvs-serv1038
make-config.sh make-target-1.sh make-target-contrib.sh make.sh
Improvements in build technology:
... detect and choose GNUMAKE earlier, once and only once.
... provide recompile and use-anyway restarts for warm load.
RCS file: /cvsroot/sbcl/sbcl/make-config.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- make-config.sh 5 Feb 2003 13:03:27 -0000 1.20
+++ make-config.sh 16 May 2003 11:37:09 -0000 1.21
@@ -66,8 +66,7 @@
elif [ "$sbcl_arch" = "mips" ] ; then
# Use a little C program to try to guess the endianness. Ware
- $gnumake -C tools-for-build determine-endianness
+ $GNUMAKE -C tools-for-build determine-endianness
tools-for-build/determine-endianness >> $ltf
# Nothing need be done in this case, but sh syntax wants a placeholder.
RCS file: /cvsroot/sbcl/sbcl/make-target-1.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- make-target-1.sh 9 Apr 2003 22:33:23 -0000 1.5
+++ make-target-1.sh 16 May 2003 11:37:10 -0000 1.6
@@ -15,25 +15,6 @@
echo //entering make-target-1.sh
-# the GNU dialect of "make" -- easier to find or port it than to
-# try to figure out how to port to the local dialect...
-if [ "$GNUMAKE" != "" ] ; then
- # The user is evidently trying to tell us something.
-elif [ -x "`which gmake`" ] ; then
- # "gmake" is the preferred name in *BSD.
- # All the world's a Linux, and all its users weary of cautious
- # BSDish worries that "make" might not be GNU make; and at this
- # point we've already spent quite a while in make-host-1.sh, so
- # they're naturally unamused when we bail out complaining we don't
- # know where GNU make is. So since it's not really any worse to guess
- # wrong here than to fail by not trying, just guess that "make" is
- # GNU make and hope for the best.
# Build the runtime system and symbol table (.nm) file.
# (This C build has to come after the first genesis in order to get
@@ -43,14 +24,14 @@
# doesn't matter.)
echo //building runtime system and symbol table file
-$gnumake clean || exit 1
-$gnumake depend || exit 1
-$gnumake all || exit 1
+$GNUMAKE clean || exit 1
+$GNUMAKE depend || exit 1
+$GNUMAKE all || exit 1
# Use a little C program to grab stuff from the C header files and
# smash it into Lisp source code.
-$gnumake grovel_headers || exit 1
+$GNUMAKE grovel_headers || exit 1
tools-for-build/grovel_headers > output/stuff-groveled-from-headers.lisp
RCS file: /cvsroot/sbcl/sbcl/make-target-contrib.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- make-target-contrib.sh 2 Apr 2003 16:08:27 -0000 1.7
+++ make-target-contrib.sh 16 May 2003 11:37:10 -0000 1.8
@@ -24,8 +24,6 @@
export SBCL SBCL_BUILDING_CONTRIB
mkdir -p contrib/systems
rm -f contrib/systems/*
@@ -37,5 +35,5 @@
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
RCS file: /cvsroot/sbcl/sbcl/make.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- make.sh 7 Feb 2003 17:11:40 -0000 1.19
+++ make.sh 16 May 2003 11:37:10 -0000 1.20
@@ -37,6 +37,8 @@
# when you have weird things in your .cmucl-init file
# "openmcl --batch"
# to use an OpenMCL binary as a cross-compilation host
+# to use a CLISP binary as a cross-compilation host
# FIXME: Make a more sophisticated command line parser, probably
# accepting "sh make.sh --xc-host foolisp" instead of the
@@ -60,6 +62,29 @@
+# the GNU dialect of "make" -- easier to find or port it than to
+# try to figure out how to port to the local dialect...
+if [ "$GNUMAKE" != "" ] ; then
+ # The user is evidently trying to tell us something.
+elif [ -x "`which gmake`" ] ; then
+ # "gmake" is the preferred name in *BSD.
+ # FIXME: Now that we do this early, maybe prompt the user rather
+ # than guessing? I'd still be annoyed, though... -- CSR,
+ # 2003-05-16.
+ # All the world's a Linux, and all its users weary of cautious
+ # BSDish worries that "make" might not be GNU make; so just guess
+ # that "make" is GNU make and hope for the best.
# If you're cross-compiling, you should probably just walk through the
# make-config.sh script by hand doing the right thing on both the host
# and target machines.
@@ -77,7 +102,8 @@
# identify the target architecture).
# On the host system:
# SBCL_XC_HOST=<whatever> sh make-host-1.sh
-# Copy src/runtime/sbcl.h from the host system to the target system.
+# Copy src/runtime/genesis/*.h from the host system to the target
# On the target system:
# sh make-target-1.sh
# Copy src/runtime/sbcl.nm and output/stuff-groveled-from-headers.lisp
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -d -r1.974 -r1.975
--- version.lisp-expr 15 May 2003 16:21:41 -0000 1.974
+++ version.lisp-expr 16 May 2003 11:37:10 -0000 1.975
@@ -17,4 +17,4 @@
;;; checkins which aren't released. (And occasionally for internal
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)