X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsolaris_2.sh;h=e8175f241a180d1936e52c96f77a265b704e0738;hb=6ac94dd724117eebd4840593a6c1fc07770a26fb;hp=bf2f1956a0f40d2158fc9d93ce138e6acf567afd;hpb=45c9e83b07a146ad42e19f44b9def27ecbdcd9e2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index bf2f195..e8175f2 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -45,7 +45,13 @@ case "$archname" in
     ;;
 esac
 
-test -z "`${cc:-cc} -V 2>&1|grep -i workshop`" || ccname=workshop
+cc=${cc:-cc}
+
+ccversion="`$cc -V 2>&1|head -1|sed 's/^cc: //'`"
+case "$ccversion" in
+*WorkShop*) ccname=workshop ;;
+*) ccversion='' ;;
+esac
 
 cat >UU/workshoplibpth.cbu<<'EOCBU'
 case "$workshoplibpth_done" in
@@ -390,34 +396,34 @@ libswanted_uselargefiles="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@
 esac
 EOCBU
 
-cat > UU/use64bitint.cbu <<'EOCBU'
-# This script UU/use64bitint.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bit integers.
-case "$use64bitint" in
+# This is truly a mess.
+case "$usemorebits" in
 "$define"|true|[yY]*)
+	use64bitint="$define"    
+	uselongdouble="$define"    
+	;;
+esac
+
+cat > UU/use64bitall.cbu <<'EOCBU'
+# This script UU/use64bitall.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to be maximally 64 bitty.
+case "$use64bitall-$use64bitall_done" in
+"$define-"|true-|[yY]*-)
 	    case "`uname -r`" in
 	    5.[1-6])
 		cat >&4 <<EOM
-Solaris `uname -r|sed -e 's/^5\.\([789]\)$/\1/'` does not support 64-bit integers.
+Solaris `uname -r|sed -e 's/^5\.\([789]\)$/\1/'` does not support 64-bit pointers.
 You should upgrade to at least Solaris 7.
 EOM
 		exit 1
 		;;
 	    esac
-	    ;;
-esac
-EOCBU
-
-cat > UU/use64bitall.cbu <<'EOCBU'
-# This script UU/use64bitall.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to be maximally 64 bitty.
-case "$use64bitall-$use64bitall_done" in
-"$define-"|true-|[yY]*-)
 	    libc='/usr/lib/sparcv9/libc.so'
 	    if test ! -f $libc; then
 		cat >&4 <<EOM
 
 I do not see the 64-bit libc, $libc.
+(You are either in an old sparc or in an x86.)
 Cannot continue, aborting.
 
 EOM