1999-08-09 18:48:15 +00:00
|
|
|
--- config.orig Mon Aug 9 12:16:51 1999
|
|
|
|
+++ config Mon Aug 9 20:30:08 1999
|
|
|
|
@@ -297,40 +297,6 @@
|
1999-03-26 08:42:49 +00:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
-# figure out if gcc is available and if so we use it otherwise
|
|
|
|
-# we fallback to whatever cc does on the system
|
1999-08-09 18:48:15 +00:00
|
|
|
-GCCVER=`(gcc --version) 2>/dev/null`
|
|
|
|
-if [ "$GCCVER" != "" ]; then
|
1999-03-26 08:42:49 +00:00
|
|
|
- CC=gcc
|
1999-08-09 18:48:15 +00:00
|
|
|
- # then strip off whatever prefix Cygnus prepends the number with...
|
|
|
|
- GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
|
|
|
|
- # peak single digit before and after first dot, e.g. 2.95.1 gives 29
|
|
|
|
- GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
|
1999-03-26 08:42:49 +00:00
|
|
|
-else
|
|
|
|
- CC=cc
|
1999-08-09 18:48:15 +00:00
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-if [ "$SYSTEM" = "SunOS" ]; then
|
|
|
|
- # assume output is "blah-blah C x.x"
|
|
|
|
- CCVER=`(cc -V 2>&1) 2>/dev/null | \
|
|
|
|
- egrep -e '^cc: .* C [0-9]\.[0-9]' | \
|
|
|
|
- sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
|
|
|
|
- CCVER=${CCVER:-0}
|
|
|
|
- if [ $CCVER -gt 40 ]; then
|
|
|
|
- CC=cc # overrides gcc!!!
|
|
|
|
- if [ $CCVER -eq 50 ]; then
|
|
|
|
- echo "WARNING! Detected WorkShop C 5.0. Do make sure you have"
|
|
|
|
- echo " patch #107357-01 or later applied."
|
|
|
|
- sleep 5
|
|
|
|
- fi
|
|
|
|
- elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then
|
|
|
|
- CC=sc3
|
1999-06-02 07:30:52 +00:00
|
|
|
- fi
|
1999-03-26 08:42:49 +00:00
|
|
|
-fi
|
1999-08-09 18:48:15 +00:00
|
|
|
-
|
|
|
|
-GCCVER=${GCCVER:-0}
|
|
|
|
-CCVER=${CCVER:-0}
|
1999-03-26 08:42:49 +00:00
|
|
|
-
|
|
|
|
# read the output of the embedded GuessOS
|
|
|
|
read GUESSOS
|
|
|
|
|
1999-08-09 18:48:15 +00:00
|
|
|
@@ -423,21 +389,6 @@
|
1999-06-02 07:30:52 +00:00
|
|
|
# *-dgux) OUT="dgux" ;;
|
|
|
|
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
|
|
|
|
esac
|
|
|
|
-
|
|
|
|
-# gcc < 2.8 does not support -mcpu=ultrasparc
|
1999-08-09 18:48:15 +00:00
|
|
|
-if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
|
|
|
|
-then
|
|
|
|
- echo "WARNING! Do consider upgrading to gcc-2.8 or later."
|
|
|
|
- sleep 5
|
|
|
|
- OUT=solaris-sparcv9-gcc27
|
|
|
|
-fi
|
|
|
|
-if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ]
|
1999-06-02 07:30:52 +00:00
|
|
|
-then
|
1999-08-09 18:48:15 +00:00
|
|
|
- echo "WARNING! Falling down to 'linux-sparcv8'."
|
|
|
|
- echo " Upgrade to gcc-2.8 or later."
|
|
|
|
- sleep 5
|
|
|
|
- OUT=linux-sparcv8
|
1999-06-02 07:30:52 +00:00
|
|
|
-fi
|
1999-03-26 08:42:49 +00:00
|
|
|
|
1999-06-02 07:30:52 +00:00
|
|
|
case "$GUESSOS" in
|
|
|
|
i386-*) options="$options 386" ;;
|