diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-02-28 04:03:44 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-02-28 04:03:44 (GMT) |
| commit | b3e11c7eaf5e2a3cf0b6bbab3ba1b7463ed3f047 (patch) | |
| tree | b448d4fa2ec12bcd3afc0642af0cb67e1c2d52ce | |
| parent | c64632b75277a9f2fa73feffb63781ada1a17d4a (diff) | |
| parent | 2c43125dbe01e2c3c1f8a05ba38d65aad0e9d229 (diff) | |
| download | hdf5-b3e11c7eaf5e2a3cf0b6bbab3ba1b7463ed3f047.zip hdf5-b3e11c7eaf5e2a3cf0b6bbab3ba1b7463ed3f047.tar.gz hdf5-b3e11c7eaf5e2a3cf0b6bbab3ba1b7463ed3f047.tar.bz2 | |
Merge pull request #2416 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_12 to hdf5_1_12
* commit '2c43125dbe01e2c3c1f8a05ba38d65aad0e9d229':
Modify expression to match mpicc built 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'` |