X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsolaris_2.sh;h=d1c1a063a4380045c2e4404360ff3b255e7fd8ac;hb=a9d9270b1989803b2cc2c5f6d551fe8565bcc2d0;hp=5d643deffd36db2447e9d689fbf7fa5044b0a3ca;hpb=6bdd71ef1830fa9fb85306405e4da0222df1321d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 5d643de..d1c1a06 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -24,7 +24,7 @@
 d_suidsafe=${d_suidsafe:-define}
 
 # Be paranoid about nm failing to find symbols
-mistrustnm=run
+mistrustnm=${mistrustnm:-run}
 
 # Several people reported problems with perl's malloc, especially
 # when use64bitall is defined or when using gcc.
@@ -210,7 +210,7 @@ if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then
 	#
 	# Using gcc.
 	#
-	ccversion='gcc'
+	cc_name='gcc'
 
 	# See if as(1) is GNU as(1).  GNU as(1) might not work for this job.
 	if echo "$verbose" | grep ' /usr/ccs/bin/as ' >/dev/null 2>&1; then
@@ -294,9 +294,12 @@ return(0);
 EOM
 	tryworkshopcc="${cc:-cc} try.c -o try"
 	if $tryworkshopcc >/dev/null 2>&1; then
-		ccversion=`./try`
-		if test "$ccversion" = "workshop" -a ! "$use64bitall_done"; then
-			loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth"
+		cc_name=`./try`
+		if test "$cc_name" = "workshop"; then
+			ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^cc: //p'`"
+			if test ! "$use64bitall_done"; then
+				loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth"
+			fi
 		fi
 	fi
 
@@ -331,20 +334,6 @@ END
 	fi
 fi
 
-# Check to see if the selected compiler and linker
-# support the -z ignore, -z lazyload and -z combreloc flags.
-echo "int main() { return(0); } " > try.c
-	zflgs=''
-for zf in ignore lazyload combreloc; do
-	if ${cc:-cc} -o try try.c -z $zf > /dev/null 2>&1; then
-		zflgs="$zflgs -z $zf"
-	fi
-done
-if test -n "$zflgs"; then
-	ccdlflags="$ccdlflags $zflgs"
-	lddlflags="$lddlflags -G $zflgs"
-fi
-
 # as --version or ld --version might dump core.
 rm -f try try.c core
 EOCBU
@@ -459,15 +448,12 @@ EOM
 		exit 1
 		;;
 	    esac
-	    ;;
-esac
+
 # gcc-2.8.1 on Solaris 8 with -Duse64bitint fails op/pat.t test 822
 # if we compile regexec.c with -O.  Turn off optimization for that one
 # file.  See hints/README.hints , especially 
 # =head2 Propagating variables to config.sh, method 3.
 #  A. Dougherty  May 24, 2002
-case "$use64bitint" in
-"$define")
     case "${gccversion}-${optimize}" in
     2.8*-O*)
 	# Honor a command-line override (rather unlikely)
@@ -567,7 +553,7 @@ cat > UU/uselongdouble.cbu <<'EOCBU'
 # after it has prompted the user for whether to use long doubles.
 case "$uselongdouble" in
 "$define"|true|[yY]*)
-	if test "$ccversion" = "workshop"; then
+	if test "$cc_name" = "workshop"; then
 		cat > try.c << 'EOM'
 #include <sunmath.h>
 int main() { (void) powl(2, 256); return(0); }