diff options
| author | kmu <kmu@hdfgroup.org> | 2019-11-26 23:24:11 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-11-26 23:24:11 (GMT) |
| commit | e971c0afa158af877b937eff615732b9262cb421 (patch) | |
| tree | aa675f077aa48c9356c04e8b8cd573da355de916 /config/gnu-flags | |
| parent | 2bb0f52edfdd0ce11595ee673a934f306ca5c4fa (diff) | |
| download | hdf5-e971c0afa158af877b937eff615732b9262cb421.zip hdf5-e971c0afa158af877b937eff615732b9262cb421.tar.gz hdf5-e971c0afa158af877b937eff615732b9262cb421.tar.bz2 | |
Revert "let hdf5 pick up the right compiler in Intel environment"
This reverts commit 3613ec7296a782c86ea5f0706a5a0cb51602abc9.
Diffstat (limited to 'config/gnu-flags')
| -rw-r--r-- | config/gnu-flags | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/gnu-flags b/config/gnu-flags index 7a6686e..6355ccf 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -29,13 +29,10 @@ if test "X-" = "X-$cc_flags_set"; then # icc beginning with version 12 includes a "gcc version compatiblilty" # string, causing the gcc H5_CFLAGS to be erroneously added. The line # "grep -v 'icc version'" causes the discarding of any output - # containing 'icc version'. The line "grep -v 'icc.orig version'" causes - # the discarding of any output containing 'icc.orig version'. - # The cc_version for icc is correctly determined + # 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.orig 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'` |