X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make.sh;h=12e77610dadd4930df5f16650c6745cca057b614;hb=c40c56eedec692acb930ec0e358a933ab33a3560;hp=3de7b1160091545ab56fba84216ef561dc7ac34c;hpb=2365c1b81d99c8e8e34665052f5b47be5cd6cd74;p=sbcl.git

diff --git a/make.sh b/make.sh
index 3de7b11..12e7761 100755
--- a/make.sh
+++ b/make.sh
@@ -61,10 +61,19 @@ build_started=`date`
 echo "//starting build: $build_started"
 
 if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] ; then
-    SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit NUL --sysinit NUL}"
+    DEVNULL=NUL
 else
-    SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit /dev/null --sysinit /dev/null}"
+    DEVNULL=/dev/null
 fi
+# The classic form here was to use --userinit $DEVNULL --sysinit
+# $DEVNULL, but that doesn't work on Win32 because SBCL doesn't handle
+# device names properly.  We still need $DEVNULL to be NUL on Win32
+# because it's used elsewhere (such as canonicalize-whitespace), so we
+# need an alternate solution for the init file overrides.  It turns
+# out that version.lisp-expr has no side effects from evaluation, so
+# we may as well use that.
+SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit version.lisp-expr --sysinit version.lisp-expr}"
+export DEVNULL
 export SBCL_XC_HOST
 echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"