1.0.35.22: fix building on Darwin when sysctl is not in PATH

Thanks to Robert Goldman for the fix.

diff --git a/NEWS b/NEWS
index e137cd4..723a091 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,8 @@ changes relative to sbcl-1.0.35:
     GENCGC platforms.  (launchpad bug lp#529014)
   * bug fix: More robust checks for invalid DEFMETHOD argument specializers.
     (launchpad bug lp#525916)
     GENCGC platforms.  (launchpad bug lp#529014)
   * bug fix: More robust checks for invalid DEFMETHOD argument specializers.
     (launchpad bug lp#525916)

+  * bug fix: Fix building on Darwin when sysctl is not in the user's PATH.
+    (Thanks to Robert Goldman)

 
 changes in sbcl-1.0.35 relative to sbcl-1.0.34:
   * optimization: ROUND with a single single-float or double-float argument
 
 changes in sbcl-1.0.35 relative to sbcl-1.0.34:
   * optimization: ROUND with a single single-float or double-float argument

diff --git a/make-config.sh b/make-config.sh
index 56c268f..5f250ec 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -129,7 +129,7 @@ if [ "$sbcl_os" = "sunos" ] && [ `isainfo -k` = "amd64" ]; then
 fi
 
 # Under Darwin, uname -m returns "i386" even if CPU is 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
+if [ "$sbcl_os" = "darwin" ] && [ "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ]; then

     guessed_sbcl_arch=x86-64
 fi
 
     guessed_sbcl_arch=x86-64
 fi
 

diff --git a/version.lisp-expr b/version.lisp-expr
index 4e19447..ba6d140 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".)
 ;;; 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.35.21"
+"1.0.35.22"