X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsolaris_2.sh;h=48fbbffff6a84e861fd48b6b9ed801db6836780a;hb=e10d0c8254dbe3d4b5c3b2ddb628e61762ab88b4;hp=5a8cbfab8b9f34adcc872898c26b3070342a5d9b;hpb=eb27ec7b16e86e1d652ce07cc0a7ce21156cc64d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 5a8cbfa..48fbbff 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -45,31 +45,53 @@ case "$archname" in
     ;;
 esac
 
-######################################################
-# General sanity testing.  See below for excerpts from the Solaris FAQ.
-
-# From roehrich@ironwood-fddi.cray.com Wed Sep 27 12:51:46 1995
-# Date: Thu, 7 Sep 1995 16:31:40 -0500
-# From: Dean Roehrich <roehrich@ironwood-fddi.cray.com>
-# To: perl5-porters@africa.nicoh.com
-# Subject: Re: On perl5/solaris/gcc
-
-# Here's another draft of the perl5/solaris/gcc sanity-checker. 
-
 test -z "`${cc:-cc} -V 2>&1|grep -i workshop`" || ccisworkshop="$define"
 test -z "`${cc:-cc} -v 2>&1|grep -i gcc`"      || ccisgcc="$define"
 
+cat >UU/workshoplibpth.cbu<<'EOCBU'
+case "$workshoplibpth_done" in
+'')	case "$use64bitall" in
+	"$define"|true|[yY]*)
+            loclibpth="$loclibpth /usr/lib/sparcv9"
+            if test -n "$workshoplibs"; then
+                loclibpth=`echo $loclibpth | sed -e "s% $workshoplibs%%" `
+                for lib in $workshoplibs; do
+                    # Logically, it should be sparcv9.
+                    # But the reality fights back, it's v9.
+                    loclibpth="$loclibpth $lib/sparcv9 $lib/v9"
+                done
+            fi 
+	    ;;
+	*)  loclibpth="$loclibpth $workshoplibs"  
+	    ;;
+	esac
+	workshoplibpth_done="$define"
+	;;
+esac
+EOCBU
+
 case "$ccisworkshop" in
 "$define")
 	cat >try.c <<EOF
 #include <sunmath.h>
 int main() { return(0); }
 EOF
-	workshoplibs=`cc -### try.c -lsunmath -o try 2>&1|grep " -Y "|sed 's%.* -Y "P,\(.*\)".*%\1%'|tr ':' '\n'|grep '/SUNWspro/'|sort -u`
-	loclibpth="$loclibpth $workshoplibs"
+	workshoplibs=`cc -### try.c -lsunmath -o try 2>&1|grep " -Y "|sed 's%.* -Y "P,\(.*\)".*%\1%'|tr ':' '\n'|grep '/SUNWspro/'`
+	. ./workshoplibpth.cbu
 	;;
 esac
 
+######################################################
+# General sanity testing.  See below for excerpts from the Solaris FAQ.
+#
+# From roehrich@ironwood-fddi.cray.com Wed Sep 27 12:51:46 1995
+# Date: Thu, 7 Sep 1995 16:31:40 -0500
+# From: Dean Roehrich <roehrich@ironwood-fddi.cray.com>
+# To: perl5-porters@africa.nicoh.com
+# Subject: Re: On perl5/solaris/gcc
+#
+# Here's another draft of the perl5/solaris/gcc sanity-checker. 
+
 case `type ${cc:-cc}` in
 */usr/ucb/cc*) cat <<END >&4
 
@@ -392,16 +414,7 @@ Cannot continue, aborting.
 EOM
 		exit 1
 	    fi 
-	    if test -n "$workshoplibs"; then
-		loclibpth=`echo $loclibpth | sed -e "s% $workshoplibs%%" `
-		for lib in $workshoplibs; do
-		    # Logically, it should be sparcv9.
-		    # But the reality fights back, it's v9.
-		    loclibpth="$loclibpth $lib/sparcv9 $lib/v9"
-		done
-		loclibpth="$loclibpth $workshoplibs"
-	    fi 
-	    loclibpth="$loclibpth /usr/lib/sparcv9"
+	    . ./UU/workshoplibpth.cbu
 	    case "$cc -v 2>/dev/null" in
 	    *gcc*)
 		echo 'main() { return 0; }' > try.c
@@ -455,17 +468,18 @@ cat > UU/uselongdouble.cbu <<'EOCBU'
 case "$uselongdouble-$uselongdouble_done" in
 "$define-"|true-|[yY]*-)
 	case "$ccisworkshop" in
-	'')	cat <<EOM
-
-I do not see the Sun Workshop compiler; therefore there is no libsunmath.so;
-therefore I cannot do long doubles, sorry.  Cannot continue, aborting.
+	'')	cat >&4 <<EOM
 
+I do not see the Sun Workshop compiler; therefore I do not see
+the libsunmath; therefore I do not know how to do long doubles, sorry.
+I'm disabling the use of long doubles.
 EOM
-		exit 1
+		uselongdouble="$undef"
+		;;
+	*)	libswanted="$libswanted sunmath"
+		loclibpth="$loclibpth /opt/SUNWspro/lib"
 		;;
 	esac
-	libswanted="$libswanted sunmath"
-	loclibpth="$loclibpth /opt/SUNWspro/lib"
 	uselongdouble_done=yes
 	;;
 esac