[svn-r5072] Purpose:

    Bug fix
Description:
    Old config assume compiler is the SGI compiler if it is not gcc.
    It would apply all SGI cc options to the $CFLAGS.  This would cause
    problem if a non-cc non-gcc compiler is used.
Solution:
    Verify the compiler is indeed the SGI compiler before applying all those
    cc specific options to the $CFLAGS.
Platforms tested:
    modi4, both parallel serial, gcc or cc, -64 or n32.

1 files changed, 39 insertions, 39 deletions

diff --git a/config/irix6.x b/config/irix6.x
index 7932854..97820da 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -26,49 +26,49 @@ case "X-$CC_BASENAME" in
 	;;
 
     *)
+	if [ "$CC_BASENAME" = cc ] || 
+	    ($CC -version 2>&1 | grep -s "MIPSpro Compilers") 2>&1 > /dev/null
+	then
+	    # use these flags if this is the SGI cc compiler or some compiler
+	    # command that eventually uses the SGI cc compiler.
 
-        # Check for old versions of the compiler that don't work right.
-        case "`$CC -version 2>&1 |head -1`" in
-	    "Mongoose Compilers: Version 7.00")
-		echo "  +---------------------------------------------------+"
-		echo "  | You have an old version of cc (Mongoose Compilers |"
-		echo "  | version 7.00).  Please upgrade to MIPSpro version |"
-		echo "  | 7.2.1.2m (patches are available from the SGI web  |"
-		echo "  | site).  The 7.00 version may generate incorrect   |"
-		echo "  | code, especially when optimizations are enabled.  |"
-		echo "  +---------------------------------------------------+"
-		sleep 5
-		;;
-	esac
+	    # Check for old versions of the compiler that don't work right.
+	    case "`$CC -version 2>&1 |head -1`" in
+		"Mongoose Compilers: Version 7.00")
+		    echo "  +---------------------------------------------------+"
+		    echo "  | You have an old version of cc (Mongoose Compilers |"
+		    echo "  | version 7.00).  Please upgrade to MIPSpro version |"
+		    echo "  | 7.2.1.2m (patches are available from the SGI web  |"
+		    echo "  | site).  The 7.00 version may generate incorrect   |"
+		    echo "  | code, especially when optimizations are enabled.  |"
+		    echo "  +---------------------------------------------------+"
+		    sleep 5
+		    ;;
+	    esac
 
-    # Do *not* use -ansi because it prevents hdf5 from being able
-    # to read modification dates from the file. On some systems it
-    # can also result in compile errors in system header files
-    # since hdf5 includes a couple non-ANSI header files.
-    #CFLAGS="$CFLAGS -ansi"
+	    # Always turn off these compiler warnings for the -64 compiler:
+	    #    1174:  function declared but not used
+	    #    1196:  __vfork() (this is an SGI config problem)
+	    #    1209:  constant expressions
+	    #    1429:  the `long long' type is not standard
+	    #    1685:  turn off warnings about turning off invalid warnings
+	    #    3201:  remark - parameter not referenced
+	    CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201"
 
-	# Always turn off these compiler warnings for the -64 compiler:
-	#    1174:  function declared but not used
-	#    1196:  __vfork() (this is an SGI config problem)
-	#    1209:  constant expressions
-	#    1429:  the `long long' type is not standard
-	#    1685:  turn off warnings about turning off invalid warnings
-    #    3201:  remark - parameter not referenced
-	CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201"
+	    # Always turn off these compiler warnings for the old compiler:
+	    #    799:   the `long long' type is not standard
+	    #    803:   turn off warnings about turning off invalid warnings
+	    #    835:   __vfork() (this is an SGI config problem)
+	    CFLAGS="$CFLAGS -woff 799,803,835"
 
-	# Always turn off these compiler warnings for the old compiler:
-	#    799:   the `long long' type is not standard
-	#    803:   turn off warnings about turning off invalid warnings
-    #    835:   __vfork() (this is an SGI config problem)
-	CFLAGS="$CFLAGS -woff 799,803,835"
-
-	# Always turn off these loader warnings:
-	# (notice the peculiar syntax)
-	#      47:  branch instructions that degrade performance on R4000
-	#      84:  a library is not used
-	#      85:  duplicate definition preemption (from -lnsl)
-	#     134:  duplicate weak definition preemption (from -lnsl)
-	CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
+	    # Always turn off these loader warnings:
+	    # (notice the peculiar syntax)
+	    #      47:  branch instructions that degrade performance on R4000
+	    #      84:  a library is not used
+	    #      85:  duplicate definition preemption (from -lnsl)
+	    #     134:  duplicate weak definition preemption (from -lnsl)
+	    CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
+	fi
 
 	# Extra debugging flags
 	DEBUG_CFLAGS="-g -fullwarn"