X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make.sh;h=500f56f74b6ad47d14bd37894d1fbd701b86d73d;hb=6c4d4d984b1af6b2a73568cec3ab9c8795cff2da;hp=2249dadaf9e2d69bbdb9b9eb86a2c5822c5cfa6d;hpb=8286d1fc02d1e769a766fbf1670bca474237161f;p=sbcl.git

diff --git a/make.sh b/make.sh
index 2249dad..500f56f 100755
--- a/make.sh
+++ b/make.sh
@@ -25,19 +25,18 @@
 #                 even though you have stuff in your initialization files
 #                 which makes it behave in such a non-standard way that
 #                 it keeps the build from working
-#   "sbcl --noprogrammer"
+#   "sbcl --disable-debugger"
 #                 to use an existing SBCL binary as a cross-compilation host
-#                 and tell it to handle errors as best it can by itself,
-#                 without trying to use *DEBUG-IO* to ask for help from
-#                 the programmer
+#                 and tell it to handle errors as best it can by itself
+#                 (probably by dying with an error code) instead of waiting
+#                 endlessly for a programmer to help it out with input
+#                 on *DEBUG-IO*
 #   "lisp -batch" to use an existing CMU CL binary as a cross-compilation host
 #   "lisp -noinit -batch" 
 #                 to use an existing CMU CL binary as a cross-compilation host
 #                 when you have weird things in your .cmucl-init file
-# Someday CLISP should work
-#   "clisp"
-# but as of sbcl-0.7.1.17, it still doesn't. (SBCL's fault: too much 
-# unportable code!)
+#   "openmcl --batch"
+#                 to use an OpenMCL 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
@@ -50,7 +49,15 @@
 # require a second pass, just testing at build-the-cross-compiler time
 # whether the cross-compilation host returns suitable values from 
 # UPGRADED-ARRAY-ELEMENT-TYPE?)
-export SBCL_XC_HOST="${1:-sbcl --noprogrammer}"
+# FIXME: --noprogrammer was deprecated in sbcl-0.7.5, replaced by 
+# --disable-debugger. We still use the old form here because the
+# change was not preannounced, and it would be rude to make our new
+# version of SBCL unbootstrappable by immediately prior versions.
+# But in a year or so the --noprogrammer here can change to
+# --disable-debugger (and the deprecated --noprogrammer support can
+# go away completely).
+SBCL_XC_HOST="${1:-sbcl --noprogrammer}"
+export SBCL_XC_HOST
 echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"
 
 # If you're cross-compiling, you should probably just walk through the
@@ -58,6 +65,10 @@ echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"
 # and target machines.
 sh make-config.sh || exit 1
 
+# Make a unique ID for this build (to discourage people from
+# mismatching sbcl and *.core files).
+echo '"'`hostname -s`-`whoami`-`date +%F-%H-%M-%S`'"' > output/build-id.tmp
+
 # The make-host-*.sh scripts are run on the cross-compilation host,
 # and the make-target-*.sh scripts are run on the target machine. In
 # ordinary compilation, we just do these phases consecutively on the
@@ -73,12 +84,16 @@ sh make-config.sh || exit 1
 #   Copy src/runtime/sbcl.h from the host system to the target system.
 #   On the target system:
 #     sh make-target-1.sh
-#   Copy src/runtime/sbcl.nm from the target system to the host system.
+#   Copy src/runtime/sbcl.nm and output/stuff-groveled-from-headers.lisp
+#     from the target system to the host system.
 #   On the host system:
 #     SBCL_XC_HOST=<whatever> sh make-host-2.sh
 #   Copy output/cold-sbcl.core from the host system to the target system.
 #   On the target system:
 #     sh make-host-2.sh
+# Or, if you can set up the files somewhere shared (with NFS, AFS, or
+# whatever) between the host machine and the target machine, the basic
+# procedure above should still work, but you can skip the "copy" steps.
 sh make-host-1.sh   || exit 1
 sh make-target-1.sh || exit 1
 sh make-host-2.sh   || exit 1