improve layout-invalid error message

[sbcl.git] / make-config.sh

diff --git a/make-config.sh b/make-config.sh
index 98564dd..3f1bc3f 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -191,10 +191,10 @@ generate_version
 # dependencies, write them out to a file to be sourced by other
 # scripts.
 
-echo "export DEVNULL=\"$DEVNULL\"" > output/build-config
-echo "export GNUMAKE=\"$GNUMAKE\"" >> output/build-config
-echo "export SBCL_XC_HOST=\"$SBCL_XC_HOST\"" >> output/build-config
-echo "export legacy_xc_spec=\"$legacy_xc_spec\"" >> output/build-config
+echo "DEVNULL=\"$DEVNULL\"; export DEVNULL" > output/build-config
+echo "GNUMAKE=\"$GNUMAKE\"; export GNUMAKE" >> output/build-config
+echo "SBCL_XC_HOST=\"$SBCL_XC_HOST\"; export SBCL_XC_HOST" >> output/build-config
+echo "legacy_xc_spec=\"$legacy_xc_spec\"; export legacy_xc_spec" >> output/build-config
 
 # And now, sorting out the per-target dependencies...
 
@@ -355,7 +355,7 @@ case "$sbcl_os" in
                printf ' :largefile' >> $ltf
                ;;
             x86 | x86-64)
-               printf ' :sb-thread :largefile' >> $ltf
+               printf ' :sb-thread :sb-futex :largefile' >> $ltf
                ;;
         esac
 
@@ -420,10 +420,10 @@ case "$sbcl_os" in
         printf ' :bsd' >> $ltf
         printf ' :darwin' >> $ltf
         if [ $sbcl_arch = "x86" ]; then
-            printf ' :mach-exception-handler :sb-lutex :restore-fs-segment-register-from-tls :ud2-breakpoints' >> $ltf
+            printf ' :mach-exception-handler :restore-fs-segment-register-from-tls :ud2-breakpoints' >> $ltf
         fi
         if [ $sbcl_arch = "x86-64" ]; then
-            printf ' :mach-exception-handler :sb-lutex :ud2-breakpoints' >> $ltf
+            printf ' :mach-exception-handler :ud2-breakpoints' >> $ltf
         fi
         link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
@@ -436,9 +436,6 @@ case "$sbcl_os" in
         if [ $sbcl_arch = "x86-64" ]; then
             printf ' :largefile' >> $ltf
         fi
-        if [ $sbcl_arch = "x86" ] || [ $sbcl_arch = "x86-64" ]; then
-            printf ' :sb-lutex' >> $ltf
-        fi
         link_or_copy Config.$sbcl_arch-sunos Config
         link_or_copy $sbcl_arch-sunos-os.h target-arch-os.h
         link_or_copy sunos-os.h target-os.h