diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-03-27 22:16:49 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-03-27 22:16:49 (GMT) |
| commit | ff1c86df14d33cda54b36d72cf2e40a8db2cf8d2 (patch) | |
| tree | ce8d0c2189ac27332bcafe0dcb91eaadd8f68441 /config/linux-gnulibc1 | |
| parent | d494d7b3b95cf893e6dd20688057bb13ba10422f (diff) | |
| download | hdf5-ff1c86df14d33cda54b36d72cf2e40a8db2cf8d2.zip hdf5-ff1c86df14d33cda54b36d72cf2e40a8db2cf8d2.tar.gz hdf5-ff1c86df14d33cda54b36d72cf2e40a8db2cf8d2.tar.bz2 | |
[svn-r26631] reverted change r26629
Diffstat (limited to 'config/linux-gnulibc1')
| -rw-r--r-- | config/linux-gnulibc1 | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1 index 465bfed..c18c02d 100644 --- a/config/linux-gnulibc1 +++ b/config/linux-gnulibc1 @@ -38,9 +38,6 @@ fi # Figure out PGI C compiler flags . $srcdir/config/pgi-flags -# Figure out CCE C compiler flags -. $srcdir/config/cce-flags - # Figure out Intel C compiler flags . $srcdir/config/intel-flags @@ -92,13 +89,10 @@ else esac fi -# Figure out PGI FC compiler flags +# Figure out PGI F90 compiler flags . $srcdir/config/pgi-fflags -# Figure out CCE FC compiler flags -. $srcdir/config/cce-fflags - -# Figure out Intel FC compiler flags +# Figure out Intel F90 compiler flags . $srcdir/config/intel-fflags case $FC_BASENAME in @@ -131,10 +125,6 @@ if test -z "$CXX"; then fi # compiler version strings - -# check if the compiler_version_info is already set -if test -z "$cc_version_info"; then - case $CC in # whatever matches *pgcc* will also match *gcc*, so this one must come first *pgcc*) @@ -163,11 +153,7 @@ case $CC in ;; esac -fi - # get fortran version info -# check if the compiler_version_info is already set -if test -z "$fc_version_info"; then case $FC in *gfortran*) fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\ @@ -213,11 +199,9 @@ case $FC in echo "No match to get fc_version_info for $FC" ;; esac -fi + # get c++ version info -# check if the compiler_version_info is already set -if test -z "$cxx_version_info"; then case $CXX in *g++*) cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\ @@ -242,4 +226,4 @@ case $CXX in echo "No match to get cxx_version_info for $CXX" ;; esac -fi + |