diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 17:08:41 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 17:08:41 (GMT) |
| commit | dd4360dccfda32f477192bd4a4ee22ee24585cf0 (patch) | |
| tree | 1a6d58a5ddaa88dfdac2e558e0ea65f38da73581 /config/sv1-cray | |
| parent | 2a2a49f42280220ad7cf2c45b1e5103d3b72146a (diff) | |
| download | hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.zip hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.tar.gz hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.tar.bz2 | |
[svn-r17645] Purpose:
Merge from Trunk
Description:
Merging all of my CFLAGS-related changes from trunk to 1.8
This includes revision #s: 17616, 17625, 17627, 17639, and 17643.
Tested:
h5committest and some additional checks on our FreeBSD as well
as NCSA's machines.
Diffstat (limited to 'config/sv1-cray')
| -rw-r--r-- | config/sv1-cray | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/config/sv1-cray b/config/sv1-cray index 4e3153f..1bae48d 100644 --- a/config/sv1-cray +++ b/config/sv1-cray @@ -73,8 +73,8 @@ RANLIB=: # PROFILE_CPPFLAGS library suitable for performance testing (like # `-pg'). This may or may not include debugging # or production flags. -# -# CFLAGS Flags can be added to this variable which +# +# H5_CFLAGS Flags can be added to this variable which # might already be partially initialized. These # flags will always be passed to the compiler # and should include switches to turn on full @@ -83,16 +83,14 @@ RANLIB=: # practices resulting in few if any # warnings. # -# Warning flags do not have to be added to CFLAGS +# Warning flags do not have to be added to H5_CFLAGS # variable if the compiler is the GNU gcc # compiler or a descendent of gcc such as EGCS or PGCC. # -# The CFLAGS should contains *something* or else -# configure will probably add `-g'. For most -# systems this isn't a problem but some systems -# will disable optimizations in favor of the -# `-g'. -# +# AM_CFLAGS Flags added directly into this variable will +# be propogated to the compiler wrapper scripts (h5cc, +# h5c++, et cetera) in addition to being used to compile +# the library. # # These flags should be set according to the compiler being used. # There are two ways to check the compiler. You can try using `-v' or @@ -103,7 +101,7 @@ RANLIB=: case $CC_BASENAME in gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions DEBUG_CFLAGS="-g -fverbose-asm" DEBUG_CPPFLAGS= PROD_CFLAGS="-O3 -fomit-frame-pointer" @@ -113,7 +111,7 @@ case $CC_BASENAME in ;; cc) - CFLAGS="$CFLAGS" + H5_CFLAGS="$H5_CFLAGS" DEBUG_CFLAGS="-g -h zero" DEBUG_CPPFLAGS= PROD_CFLAGS="-O2 -h scalar0 -h vector0 -h task1" @@ -123,7 +121,7 @@ case $CC_BASENAME in ;; *) - CFLAGS="$CFLAGS -ansi" + H5_CFLAGS="$H5_CFLAGS -ansi" DEBUG_CFLAGS="-g" DEBUG_CPPFLAGS= PROD_CFLAGS="-O" @@ -163,7 +161,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FCFLAGS="$FCFLAGS -dp" + H5_FCFLAGS="$H5_FCFLAGS -dp" DEBUG_FCFLAGS="-dp" PROD_FCFLAGS="-dp" PROFILE_FCFLAGS="-dp" @@ -180,7 +178,7 @@ fi case $CXX_BASENAME in g++) - CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions + H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions DEBUG_CXXFLAGS="-g -fverbose-asm" DEBUG_CPPFLAGS= PROD_CXXFLAGS="-O3 -fomit-frame-pointer" @@ -190,7 +188,7 @@ case $CXX_BASENAME in ;; *) - CXXFLAGS="$CXXFLAGS -h instantiate=used" + H5_CXXFLAGS="$H5_CXXFLAGS -h instantiate=used" DEBUG_CXXFLAGS="-g" DEBUG_CPPFLAGS= PROD_CXXFLAGS="-O" |