1.0.10.40: Fix build for windows when source directory contains spaces

diff --git a/make-config.sh b/make-config.sh
index e85d17a..9e60a6f 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -139,7 +139,7 @@ for d in src/compiler src/assembly; do
         echo "missing sbcl_arch directory $PWD/$sbcl_arch"
         exit 1
     fi
-    cd $original_dir
+    cd "$original_dir"
 done
 
 echo //setting up symlink src/compiler/assembly
@@ -147,7 +147,7 @@ remove_dir_safely src/compiler/assembly
 original_dir=`pwd`
 cd src/compiler
 link_or_copy ../assembly assembly
-cd $original_dir
+cd "$original_dir"
 
 echo //setting up OS-dependent information
 original_dir=`pwd`
@@ -256,7 +256,7 @@ case "$sbcl_os" in
         exit 1
         ;;
 esac
-cd $original_dir
+cd "$original_dir"
 
 # FIXME: Things like :c-stack-grows-..., etc, should be
 # *derived-target-features* or equivalent, so that there was a nicer

diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 249a014..934fb9a 100644 (file)
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -26,8 +26,11 @@ find_gnumake
 . ./sbcl-pwd.sh
 sbcl_pwd
 
-SBCL_HOME=$SBCL_PWD/contrib
+SBCL_HOME="$SBCL_PWD/contrib"
 export SBCL_HOME
+if [ "$OSTYPE" = "cygwin" ] ; then
+    SBCL_PWD=`echo $SBCL_PWD | sed s/\ /\\\\\\\\\ /g`
+fi
 
 SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --disable-debugger --no-sysinit --no-userinit"
 SBCL_BUILDING_CONTRIB=1

diff --git a/sbcl-pwd.sh b/sbcl-pwd.sh
index d408005..ceded1e 100644 (file)
--- a/sbcl-pwd.sh
+++ b/sbcl-pwd.sh
@@ -5,7 +5,7 @@
 
 sbcl_pwd() {
     if [ "$OSTYPE" = "cygwin" ] ; then
-       SBCL_PWD=`cygpath -m $(pwd)`
+       SBCL_PWD=`cygpath -m "$(pwd)"`
     else
        SBCL_PWD=`pwd`
     fi

diff --git a/version.lisp-expr b/version.lisp-expr
index 6044f7c..a66324a 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -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".)
-"1.0.10.39"
+"1.0.10.40"