summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-02-27 23:06:41 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-02-27 23:06:41 (GMT)
commit811988f82c182012704942d333ee7800f4a78349 (patch)
treec22b535b297be11079368ad70cf8facc7507a719 /config
parent0a581b0ac057d21c4f13401950f5f678c2ced9bd (diff)
downloadhdf5-811988f82c182012704942d333ee7800f4a78349.zip
hdf5-811988f82c182012704942d333ee7800f4a78349.tar.gz
hdf5-811988f82c182012704942d333ee7800f4a78349.tar.bz2
Modfy expression to match mpicc build with Intel as intel compiler, not
gcc.
Diffstat (limited to 'config')
-rw-r--r--config/gnu-cxxflags2
-rw-r--r--config/gnu-flags2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index e0f2999..f8a6d8c 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -32,7 +32,7 @@ if test X = "X$cxx_flags_set"; then
# containing 'icc version'. The cc_version for icc is correctly determined
# and flags added in the intel-flags script.
cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 | grep -v 'PathScale' |\
- grep -v 'icc version' |\
+ grep -v '^icc.*version' |\
grep 'gcc version' | sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
cxx_vendor=`echo $cxx_version |sed 's/\([a-z]*\).*/\1/'`
cxx_version=`echo $cxx_version |sed 's/[-a-z]//g'`
diff --git a/config/gnu-flags b/config/gnu-flags
index 3ca74c1..11aaa71 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -47,7 +47,7 @@ if test "X-" = "X-$cc_flags_set"; then
# containing 'icc version'. The cc_version for icc is correctly determined
# and flags added in the intel-flags script.
cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 | grep -v 'PathScale' |\
- grep -v 'icc version' |\
+ grep -v '^icc.*version' |\
grep 'gcc version' | sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
cc_version=`echo $cc_version |sed 's/[-a-z]//g'`