summaryrefslogtreecommitdiffstats
path: root/config/linux-gnulibc1
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-03-28 20:24:36 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-03-28 20:24:36 (GMT)
commit8e5a71c716c4d88b273137a81376f1a63ba54900 (patch)
treeb25849b518a58150970842a3e6601c136f92a6d0 /config/linux-gnulibc1
parent72d896f70948d515cf047e76d1067ae5c3ccd35c (diff)
downloadhdf5-8e5a71c716c4d88b273137a81376f1a63ba54900.zip
hdf5-8e5a71c716c4d88b273137a81376f1a63ba54900.tar.gz
hdf5-8e5a71c716c4d88b273137a81376f1a63ba54900.tar.bz2
[svn-r26642] Fix for HDFFV09202 and HDFFV-9171.
HDFFV-9171 Configure mistakes Cray Compilers for Intel Compilers, HDFFV-9202 subroutine VERIFY() fails when checking 8 byte integers in fortran tests Tested: h5committest
Diffstat (limited to 'config/linux-gnulibc1')
-rw-r--r--config/linux-gnulibc124
1 files changed, 20 insertions, 4 deletions
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index c18c02d..465bfed 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -38,6 +38,9 @@ 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
@@ -89,10 +92,13 @@ else
esac
fi
-# Figure out PGI F90 compiler flags
+# Figure out PGI FC compiler flags
. $srcdir/config/pgi-fflags
-# Figure out Intel F90 compiler flags
+# Figure out CCE FC compiler flags
+. $srcdir/config/cce-fflags
+
+# Figure out Intel FC compiler flags
. $srcdir/config/intel-fflags
case $FC_BASENAME in
@@ -125,6 +131,10 @@ 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*)
@@ -153,7 +163,11 @@ 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 |\
@@ -199,9 +213,11 @@ 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 |\
@@ -226,4 +242,4 @@ case $CXX in
echo "No match to get cxx_version_info for $CXX"
;;
esac
-
+fi