X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=f251797be89334b9746c3720bbf462377841f3b1;hb=746c4003dd76ea67647c87176e4c818f512d59b7;hp=52bba33234f8d5331bd83a0baf4cf97230362b07;hpb=6e3259c47f3c53001d762e0aa9df12dfc0251dd4;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 52bba33..f251797 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -44,6 +44,7 @@ bad_option() {
 
 WITH_FEATURES=""
 WITHOUT_FEATURES=""
+FANCY_FEATURES=":sb-core-compression :sb-xref-for-internals :sb-after-xc-core"
 
 fancy=false
 some_options=false
@@ -90,7 +91,7 @@ do
         WITHOUT_FEATURES="$WITHOUT_FEATURES :$optarg"
 	;;
       --fancy)
-        WITH_FEATURES="$WITH_FEATURES :sb-core-compression :sb-xref-for-internals :sb-after-xc-core"
+        WITH_FEATURES="$WITH_FEATURES $FANCY_FEATURES"
         # Lower down we add :sb-thread for platforms where it can be built.
         fancy=true
         ;;
@@ -165,6 +166,12 @@ Options:
   --with-<feature>     Build with specified feature.
   --without-<feature>  Build wihout the specfied feature.
 
+  --fancy              Build with several optional features:
+
+                           $FANCY_FEATURES
+
+                       Plus threading on platforms which support it.
+
   --arch=<string>      Specify the architecture to build for.
 
       Mainly for doing x86 builds on x86-64.
@@ -286,7 +293,16 @@ esac
 
 link_or_copy() {
    if [ "$sbcl_os" = "win32" ] ; then
-       cp -r "$1" "$2"
+      # Use preprocessor or makefile includes instead of copying if
+      # possible, to avoid unexpected use of the original, unchanged
+      # files when re-running only make-target-1 during development.
+      if echo "$1" | egrep '[.][ch]$'; then
+         echo "#include \"$1\"" >"$2"
+      elif echo "$1" | egrep '^Config[.]'; then
+         echo "include $1" >"$2"
+      else
+         cp -r "$1" "$2"
+      fi
    else
        ln -s "$1" "$2"
    fi
@@ -365,8 +381,13 @@ then
     # If --fancy, enable threads on platforms where they can be built.
     case $sbcl_arch in
         x86|x86-64|ppc)
-            WITH_FEATURES="$WITH_FEATURES :sb-thread"
-            echo "Enabling threads due to --fancy."
+	    if [ "$sbcl_os" = "sunos" ] && [ "$sbcl_arch" = "x86-64" ]
+	    then
+		echo "No threads on this platform."
+	    else
+		WITH_FEATURES="$WITH_FEATURES :sb-thread"
+		echo "Enabling threads due to --fancy."
+	    fi
             ;;
         *)
             echo "No threads on this platform."
@@ -505,6 +526,7 @@ case "$sbcl_os" in
         ;;
     win32)
         printf ' :win32' >> $ltf
+        printf ' :sb-qshow' >> $ltf
         link_or_copy Config.$sbcl_arch-win32 Config
         link_or_copy $sbcl_arch-win32-os.h target-arch-os.h
         link_or_copy win32-os.h target-os.h
@@ -571,12 +593,6 @@ elif [ "$sbcl_arch" = "mips" ]; then
     printf ' :stack-allocatable-closures :stack-allocatable-vectors' >> $ltf
     printf ' :stack-allocatable-lists :stack-allocatable-fixed-objects' >> $ltf
     printf ' :alien-callbacks' >> $ltf
-    # Use a little C program to try to guess the endianness.  Ware
-    # cross-compilers!
-    #
-    # FIXME: integrate to grovel-features, mayhaps
-    $GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime
-    tools-for-build/determine-endianness >> $ltf
 elif [ "$sbcl_arch" = "ppc" ]; then
     printf ' :gencgc :stack-allocatable-closures :stack-allocatable-lists' >> $ltf
     printf ' :linkage-table :raw-instance-init-vops :memory-barrier-vops' >> $ltf
@@ -623,6 +639,13 @@ else
     echo > /dev/null
 fi
 
+# Use a little C program to try to guess the endianness.  Ware
+# cross-compilers!
+#
+# FIXME: integrate to grovel-features, mayhaps
+$GNUMAKE -C tools-for-build determine-endianness -I ../src/runtime
+tools-for-build/determine-endianness >> $ltf
+
 export sbcl_os sbcl_arch
 sh tools-for-build/grovel-features.sh >> $ltf