1.0.31.19: build x86-64 on OS X when available by default

 * For consistency with other platforms, build x86-64 by default on OS
   X when the OS and hardware support it.
 * ... also clean up some stragglers needing .cvsignore entries

diff --git a/contrib/sb-queue/.cvsignore b/contrib/sb-queue/.cvsignore
new file mode 100644 (file)
index 0000000..e805886
--- /dev/null
+++ b/contrib/sb-queue/.cvsignore
@@ -0,0 +1 @@
+test-passed

diff --git a/make-config.sh b/make-config.sh
index e3da7bc..fa4768e 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -128,6 +128,11 @@ if [ "$sbcl_os" = "sunos" ] && [ `isainfo -k` = "amd64" ]; then
     guessed_sbcl_arch=x86-64
 fi
 
+# Under Darwin, uname -m returns "i386" even if CPU is x86_64.
+if [ "$sbcl_os" = "darwin" ] && [ "`sysctl -n hw.optional.x86_64`" = "1" ]; then
+    guessed_sbcl_arch=x86-64
+fi
+
 echo //setting up CPU-architecture-dependent information
 sbcl_arch=${SBCL_ARCH:-$guessed_sbcl_arch}
 echo sbcl_arch=\"$sbcl_arch\"

diff --git a/tools-for-build/.cvsignore b/tools-for-build/.cvsignore
index 9e0c53c..5c687a1 100644 (file)
--- a/tools-for-build/.cvsignore
+++ b/tools-for-build/.cvsignore
@@ -1,3 +1,4 @@
 grovel-headers
 determine-endianness
 where-is-mcontext
+*.dSYM

diff --git a/version.lisp-expr b/version.lisp-expr
index b810a18..989c2b9 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.31.18"
+"1.0.31.19"