From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sun, 24 Oct 1999 21:48:02 +0000 (+0000)
Subject: Hints tweak.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=75d72f2c8b64d5e89ae0080adfff19385a568f22;p=p5sagit%2Fp5-mst-13.2.git

Hints tweak.

p4raw-id: //depot/cfgperl@4446
---

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index fd7f479..65c6cb3 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -62,7 +62,7 @@
 # Configure Black Magic (TM)
 	# reset
 	_DEC_cc_style=
-case "$cc" in
+case "$cc -v 2>&1 | grep cc" in
 *gcc*)	;; # pass
 *)	# compile something small: taint.c is fine for this.
     	# the main point is the '-v' flag of 'cc'.
@@ -80,7 +80,7 @@ case "$cc" in
 esac
 
 # be nauseatingly ANSI
-case "$cc" in
+case "$cc -v 2>&1 | grep gcc" in
 *gcc*)	ccflags="$ccflags -ansi"
 	;;
 *)	ccflags="$ccflags -std"
@@ -93,7 +93,7 @@ esac
 # we want optimisation
 
 case "$optimize" in
-'')	case "$cc" in 
+'')	case "$cc -v 2>&1 | grep gcc" in
 	*gcc*)	
 		optimize='-O3'				;;
 	*)	case "$_DEC_cc_style" in
@@ -207,17 +207,19 @@ pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"'
 cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
-        # Threads interfaces changed with V4.0.
-        case "`uname -r`" in
-        *[123].*)
-	    libswanted="$libswanted pthreads mach exc c_r"
-  	    ccflags="-threads $ccflags"
+	# Threads interfaces changed with V4.0.
+	case "$cc -v 2>&1 | grep gcc" in
+	*gcc*)ccflags="-D_REENTRANT $ccflags" ;;
+	*)  case "`uname -r`" in
+	    *[123].*)	ccflags="-threads $ccflags" ;;
+	    *)          ccflags="-pthread $ccflags" ;;
+	    esac
 	    ;;
-        *)
-	    libswanted="$libswanted pthread exc"
-    	    ccflags="-pthread $ccflags"
-	    ;;
-        esac
+	esac    
+	case "`uname -r`" in
+	*[123].*) libswanted="$libswanted pthreads mach exc c_r" ;;
+	*)        libswanted="$libswanted pthread exc" ;;
+	esac
 
         usemymalloc='n'
 	;;
@@ -359,5 +361,3 @@ unset _DEC_cc_style
 #	* Set -Olimit to 3200 because perl_yylex.c got too big
 #	  for the optimizer.
 #
-
-