1.0.35.1: Fix CONDITION-WAIT not to signal a deadline twice (LP #512914)

[sbcl.git] / make-config.sh

diff --git a/make-config.sh b/make-config.sh
index fa4768e..c9dad1d 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -143,6 +143,17 @@ fi
 printf ":%s" "$sbcl_arch" >> $ltf
 
 echo //setting up OS-dependent information
+
+# Under Darwin x86-64, guess whether Darwin 9+ or below.
+if [ "$sbcl_os" = "darwin" ] && [ "$sbcl_arch" = "x86-64" ]; then
+       darwin_version=`uname -r`
+       darwin_version_major=${DARWIN_VERSION_MAJOR:-${darwin_version%%.*}}
+       if (( 8 < $darwin_version_major )); then
+               ver9_or_above="9+"
+               printf ' :inode64' >> $ltf
+       fi
+fi
+
 original_dir=`pwd`
 cd ./src/runtime/
 rm -f Config target-arch-os.h target-arch.h target-os.h target-lispregs.h
@@ -160,9 +171,12 @@ case "$sbcl_os" in
         # If you add other platforms here, don't forget to edit
         # src/runtime/Config.foo-linux too.
         case "$sbcl_arch" in
-        x86 | mips)
-            printf ' :largefile' >> $ltf
-            ;;
+           mips)
+               printf ' :largefile' >> $ltf
+               ;;
+            x86 | x86-64)
+               printf ' :sb-thread :largefile' >> $ltf
+               ;;
         esac
 
         if [ $sbcl_arch = "x86-64" ]; then
@@ -233,7 +247,7 @@ case "$sbcl_os" in
         fi
         link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
-        link_or_copy Config.$sbcl_arch-darwin Config
+        link_or_copy Config.$sbcl_arch-darwin$ver9_or_above Config
         ;;
     sunos)
         printf ' :unix' >> $ltf