diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-02-28 04:03:28 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-02-28 04:03:28 (GMT) |
| commit | cfc52fc273a098ffa0cd10f41a9b4191e1f38f16 (patch) | |
| tree | c22b535b297be11079368ad70cf8facc7507a719 | |
| parent | 0a581b0ac057d21c4f13401950f5f678c2ced9bd (diff) | |
| parent | 811988f82c182012704942d333ee7800f4a78349 (diff) | |
| download | hdf5-cfc52fc273a098ffa0cd10f41a9b4191e1f38f16.zip hdf5-cfc52fc273a098ffa0cd10f41a9b4191e1f38f16.tar.gz hdf5-cfc52fc273a098ffa0cd10f41a9b4191e1f38f16.tar.bz2 | |
Merge pull request #2415 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '811988f82c182012704942d333ee7800f4a78349':
Modfy expression to match mpicc build with Intel as intel compiler, not gcc.
| -rw-r--r-- | config/gnu-cxxflags | 2 | ||||
| -rw-r--r-- | config/gnu-flags | 2 |
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'` |