X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make-config.sh;h=491807ccfdf40e98f0fa06ccbcaa7a99a5d74ecc;hb=b42c75203a3f077e8f59373a48af5e3a304addbf;hp=2a70efe8e502af3f426c4dcbfa39f80c1c4b91d9;hpb=dcd86042bba514f5dfc39246de9cdbb030648569;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index 2a70efe..491807c 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -123,6 +123,11 @@ case `uname -m` in
         ;;
 esac
 
+# Under Solaris, uname -m returns "i86pc" even if CPU is amd64.
+if [ "$sbcl_os" = "sunos" ] && [ `isainfo -k` = "amd64" ]; 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\"
@@ -132,27 +137,6 @@ if [ "$sbcl_arch" = "" ] ; then
 fi
 printf ":%s" "$sbcl_arch" >> $ltf
 
-for d in src/compiler src/assembly; do
-    echo //setting up symlink $d/target
-    original_dir=`pwd`
-    remove_dir_safely "$d/target"
-    cd ./$d
-    if [ -d $sbcl_arch ] ; then
-        link_or_copy $sbcl_arch target
-    else
-        echo "missing sbcl_arch directory $PWD/$sbcl_arch"
-        exit 1
-    fi
-    cd "$original_dir"
-done
-
-echo //setting up symlink src/compiler/assembly
-remove_dir_safely src/compiler/assembly
-original_dir=`pwd`
-cd src/compiler
-link_or_copy ../assembly assembly
-cd "$original_dir"
-
 echo //setting up OS-dependent information
 original_dir=`pwd`
 cd ./src/runtime/
@@ -250,7 +234,7 @@ case "$sbcl_os" in
         printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :sunos' >> $ltf
-        if [ $sbcl_arch = "x86" ]; then
+        if [ $sbcl_arch = "x86" ] || [ $sbcl_arch = "amd64" ]; then
             printf ' :sb-lutex' >> $ltf
         fi
         link_or_copy Config.$sbcl_arch-sunos Config