From f6a86261bc0f2a3e71d67ed2ecf19fe4baa38a12 Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Mon, 27 Sep 1999 19:01:32 -0500
Subject: [PATCH] [svn-r1672] bin/ltconfig:     ltconfig used just an empty
 source file to test the share lib     compiler options.  SUNSpro CC returns
 succeed though it issues     a warning too.  ltconfig did not like the
 warning.     Changed it to test with a file containing a simple dummy
 program.     Platform tested: solaris 2.6 and 2.7

config/solaris2.x:
    Changed default compiler to "cc" now that Sunpro CC can produce
    static and shared codes correctly.
    Also added -s to PROD_CFLAGS to produce leaner binary files.
---
 bin/ltconfig      |  2 +-
 config/solaris2.x | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/ltconfig b/bin/ltconfig
index 2347e69439..adc36bc2b9 100755
--- a/bin/ltconfig
+++ b/bin/ltconfig
@@ -541,7 +541,7 @@ if test -n "$pic_flag"; then
   # Check to make sure the pic_flag actually works.
   echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
   $rm conftest*
-  echo > conftest.c
+  echo 'main(){return(0);}' > conftest.c
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pic_flag -DPIC"
   echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5
diff --git a/config/solaris2.x b/config/solaris2.x
index a114ebc214..597a17c2d5 100644
--- a/config/solaris2.x
+++ b/config/solaris2.x
@@ -6,10 +6,10 @@
 #
 # See BlankForm in this directory for details
 
-# The default compiler is `gcc'
+# The default compiler is `sunpro cc'
 if test "X-" =  "X-$CC"; then
-    CC=gcc
-    CC_BASENAME=gcc
+    CC=cc
+    CC_BASENAME=cc
 fi
 
 # Try gcc compiler flags
@@ -20,9 +20,13 @@ if test "X-" = "X-$cc_flags_set"; then
     CFLAGS="-erroff=%none"
     DEBUG_CFLAGS=-g
     DEBUG_CPPFLAGS=
-    PROD_CFLAGS=-xO2
+    PROD_CFLAGS="-O -s"
     PROD_CPPFLAGS=
     PROFILE_CFLAGS=-xpg
     PROFILE_CPPFLAGS=
     cc_flags_set=yes
+    # Turn off optimization flag for SUNpro compiler versions 4.x which
+    # have an optimization bug.  Version 5.0 works.
+    ($CC -V 2>&1) | grep -s 'cc: .* C 4\.' >/dev/null 2>&1 \
+	&& PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`"
 fi