X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-config.sh;h=9c2a5baa5c89ca39d9b8d81fab38a11e5b621b34;hb=4ff8421d6f4590024f82ea6f6851e25b4ca3df99;hp=c157609ca0cc694f6c285504b47569d8352b7ba7;hpb=672ac5849b408281b5ca0dfc3fd58d418de2b272;p=sbcl.git

diff --git a/make-config.sh b/make-config.sh
index c157609..9c2a5ba 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -18,24 +18,68 @@
 
 echo //entering make-config.sh
 
+echo //ensuring the existence of output/ directory
+if [ ! -d output ] ; then mkdir output; fi
+
 ltf=`pwd`/local-target-features.lisp-expr
 echo //initializing $ltf
 echo ';;;; This is a machine-generated file.' > $ltf
-echo ';;;; Please do not edit it by hand.' > $ltf
-echo ';;;; See make-config.sh.' > $ltf
-echo -n '(' >> $ltf
+echo ';;;; Please do not edit it by hand.' >> $ltf
+echo ';;;; See make-config.sh.' >> $ltf
+printf '(' >> $ltf
+
+echo //guessing default target CPU architecture from host architecture
+case `uname -m` in 
+    *86) guessed_sbcl_arch=x86 ;; 
+    [Aa]lpha) guessed_sbcl_arch=alpha ;;
+    sparc*) guessed_sbcl_arch=sparc ;;
+    sun*) guessed_sbcl_arch=sparc ;;
+    ppc) guessed_sbcl_arch=ppc ;;
+    parisc) guessed_sbcl_arch=hppa ;;
+    mips) guessed_sbcl_arch=mips ;;
+    *)
+        # If we're not building on a supported target architecture, we
+	# we have no guess, but it's not an error yet, since maybe
+	# target architecture will be specified explicitly below.
+	guessed_sbcl_arch=''
+	;;
+esac
 
 echo //setting up CPU-architecture-dependent information
-# Currently supported: x86 alpha
-sbcl_arch=${SBCL_ARCH:-x86}
-echo -n ":$sbcl_arch" >> $ltf 
+sbcl_arch=${SBCL_ARCH:-$guessed_sbcl_arch}
+echo sbcl_arch=\"$sbcl_arch\"
+if [ "$sbcl_arch" = "" ] ; then
+    echo "can't guess target SBCL architecture, need SBCL_ARCH environment var"
+    exit 1
+fi
+printf ":%s" "$sbcl_arch" >> $ltf 
+# KLUDGE: currently the x86 only works with the generational garbage
+# collector (indicated by the presence of :GENCGC in *FEATURES*) and
+# alpha, sparc and ppc with the stop'n'copy collector (indicated by
+# the absence of :GENCGC in *FEATURES*). This isn't a great
+# separation, but for now, rather than have :GENCGC in
+# base-target-features.lisp-expr, we add it into local-target-features
+# if we're building for x86. -- CSR, 2002-02-21 Then we do something
+# similar with :STACK-GROWS-FOOWARD, too. -- WHN 2002-03-03
+if [ "$sbcl_arch" = "x86" ] ; then
+    printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack' >> $ltf
+elif [ "$sbcl_arch" = "mips" ] ; then
+    # Use a little C program to try to guess the endianness.  Ware
+    # cross-compilers!
+    gnumake=${GNUMAKE:-gmake}
+    $gnumake -C tools-for-build determine-endianness
+    tools-for-build/determine-endianness >> $ltf
+else
+    # Nothing need be done in this case, but sh syntax wants a placeholder.
+    echo > /dev/null
+fi
 for d in src/compiler src/assembly; do
     echo //setting up symlink $d/target
     original_dir=`pwd`
     cd $d
-    if [ -L target ] ; then
+    if [ -h target ] ; then
 	rm target
-    elif [ -e target ] ; then
+    elif [ -w target ] ; then
 	echo "I'm afraid to replace non-symlink $d/target with a symlink."
 	exit 1
     fi
@@ -48,29 +92,70 @@ for d in src/compiler src/assembly; do
     cd $original_dir
 done
 
+echo //setting up symlink src/compiler/assembly
+if [ -h src/compiler/assembly ] ; then
+    rm src/compiler/assembly
+elif [ -w src/compiler/assembly ] ; then
+    echo "I'm afraid to replace non-symlink compiler/assembly with a symlink."
+    exit 1
+fi
+ln -s ../assembly src/compiler/assembly
+
 echo //setting up OS-dependent information
 original_dir=`pwd`
 cd src/runtime/
-rm -f Config
-if [ `uname` = Linux ]; then
-    echo -n ' :linux' >> $ltf
-    ln -s Config.$sbcl_arch-linux Config
-elif uname | grep BSD; then
-    echo -n ' :bsd' >> $ltf
-    if [ `uname` = FreeBSD ]; then
-	echo -n ' :freebsd' >> $ltf
-	ln -s Config.$sbcl_arch-freebsd Config
-    elif [ `uname` = OpenBSD ]; then
-	echo -n ' :openbsd' >> $ltf
-	ln -s Config.$sbcl_arch-openbsd Config
-    else
-	echo unsupported BSD variant: `uname`
+rm -f Config target-arch-os.h target-arch.h target-os.h target-lispregs.h
+# KLUDGE: these two logically belong in the previous section
+# ("architecture-dependent"); it seems silly to enforce this in terms
+# of the shell script, though. -- CSR, 2002-02-03
+ln -s $sbcl_arch-arch.h target-arch.h
+ln -s $sbcl_arch-lispregs.h target-lispregs.h
+case `uname` in 
+    Linux)
+	printf ' :linux' >> $ltf
+	ln -s Config.$sbcl_arch-linux Config
+	ln -s $sbcl_arch-linux-os.h target-arch-os.h
+	ln -s linux-os.h target-os.h
+	;;
+    OSF1)			
+        # it's changed name twice since it was called OSF/1: clearly
+        # the marketers forgot to tell the engineers about Digital Unix
+        # _or_ OSF/1 ...
+	printf ' :osf1' >> $ltf
+        ln -s Config.$sbcl_arch-osf1 Config
+	ln -s $sbcl_arch-osf1-os.h target-arch-os.h
+	ln -s osf1-os.h target-os.h
+	;;
+    *BSD)
+	printf ' :bsd' >> $ltf
+	ln -s $sbcl_arch-bsd-os.h target-arch-os.h
+	ln -s bsd-os.h target-os.h
+	case `uname` in
+	    FreeBSD)
+		printf ' :freebsd' >> $ltf
+		ln -s Config.$sbcl_arch-freebsd Config
+		;;
+	    OpenBSD)
+		printf ' :openbsd' >> $ltf
+		ln -s Config.$sbcl_arch-openbsd Config
+		;;
+	    *)
+		echo unsupported BSD variant: `uname`
+		exit 1
+		;;
+	esac
+	;;
+    SunOS)
+        printf ' :sunos' >> $ltf
+	ln -s Config.$sbcl_arch-sunos Config
+	ln -s $sbcl_arch-sunos-os.h target-arch-os.h
+	ln -s sunos-os.h target-os.h
+	;;
+    *)
+	echo unsupported OS type: `uname`
 	exit 1
-    fi
-else
-    echo unsupported OS type: `uname`
-    exit 1
-fi
+	;;
+esac
 cd $original_dir
 
 echo //finishing $ltf
@@ -83,3 +168,8 @@ echo ')' >> $ltf
 # cp base-version.txt $versionfile
 # echo " (built `date -u` by `whoami`@`hostname`)" >> $versionfile
 # echo 'This is a machine-generated file and should not be edited by hand.' >> $versionfile
+
+# Make a unique ID for this build (to discourage people from
+# mismatching sbcl and *.core files).
+echo '"'`hostname`-`whoami`-`date +%F-%H-%M-%S`'"' > output/build-id.tmp
+