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/dec-flags | |
| 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/dec-flags')
| -rw-r--r-- | config/dec-flags | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/dec-flags b/config/dec-flags index fe9ee87..8f3fa1a 100644 --- a/config/dec-flags +++ b/config/dec-flags @@ -26,7 +26,7 @@ # if test X = "X$cc_flags_set"; then cc_vendor=DEC - cc_version="`$CC $CFLAGS -V 2>&1 |head -1`" + cc_version="`$CC $CFLAGS $H5_CFLAGS -V 2>&1 |head -1`" case "$cc_version" in DEC*) cc_version="`echo $cc_version |\ @@ -111,7 +111,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FCFLAGS="$FCFLAGS -Olimit 2048 -std1" + H5_FCFLAGS="$H5_FCFLAGS -Olimit 2048 -std1" DEBUG_FCFLAGS="-Olimit 2048 -std1" PROD_FCFLAGS="-Olimit 2048 -std1" PROFILE_FCFLAGS="-Olimit 2048 -std1" @@ -128,7 +128,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" @@ -138,7 +138,7 @@ case $CXX_BASENAME in ;; *) - CXXFLAGS="$CXXFLAGS -tlocal -D__USE_STD_IOSTREAM" + H5_CXXFLAGS="$H5_CXXFLAGS -tlocal -D__USE_STD_IOSTREAM" DEBUG_CXXFLAGS="-g" DEBUG_CPPFLAGS= PROD_CXXFLAGS="-O" |