summaryrefslogtreecommitdiffstats
path: root/config/solaris2.x
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2003-11-14 20:36:53 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2003-11-14 20:36:53 (GMT)
commitb303888f43fb1ddf0bbb68931270954eb950b77c (patch)
tree711e3428558696d3e938f9b1b90eebefc83486cf /config/solaris2.x
parenta9d0aadef0cd3ae6d6f36f2306a79d61bf31e943 (diff)
downloadhdf5-b303888f43fb1ddf0bbb68931270954eb950b77c.zip
hdf5-b303888f43fb1ddf0bbb68931270954eb950b77c.tar.gz
hdf5-b303888f43fb1ddf0bbb68931270954eb950b77c.tar.bz2
[svn-r7854] Purpose:
Bug Fix Description: The FFLAGS, CXXFLAGS, and CPPFLAGS variables weren't carrying user-defined values into the Makefiles. Solution: Changed the flags from FOO="..." to FOO="$FOO ..." Platforms tested: Copper Verbena Arabica Misc. update:
Diffstat (limited to 'config/solaris2.x')
-rw-r--r--config/solaris2.x8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/solaris2.x b/config/solaris2.x
index 31b12ee..1d65073 100644
--- a/config/solaris2.x
+++ b/config/solaris2.x
@@ -17,7 +17,7 @@ fi
# Try solaris native compiler flags
if test "X-" = "X-$cc_flags_set"; then
- CFLAGS="-erroff=%none -DBSD_COMP"
+ CFLAGS="$CFLAGS -erroff=%none -DBSD_COMP"
DEBUG_CFLAGS="-g -xildoff"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O -s"
@@ -60,7 +60,7 @@ fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
- FFLAGS=""
+ FFLAGS="$FFLAGS"
DEBUG_FFLAGS=""
PROD_FFLAGS=""
PROFILE_FFLAGS=""
@@ -88,14 +88,14 @@ cxx_vers_patch=`echo $cxx_version | cut -f3 -d.`
# Specify the "-features=tmplife" if the compiler can handle this...
if test -n "$cxx_version"; then
if test $cxx_vers_major -ge 5 -a $cxx_vers_minor -ge 3 -o $cxx_vers_major -gt 5; then
- CXXFLAGS="-features=tmplife"
+ CXXFLAGS="$CXXFLAGS -features=tmplife"
fi
fi
# Try solaris native compiler flags
if test -z "$cxx_flags_set"; then
CXXFLAGS="$CXXFLAGS -instances=global"
- CPPFLAGS="-LANG:std"
+ CPPFLAGS="$CPPFLAGS -LANG:std"
DEBUG_CXXFLAGS=-g
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O -s"