From 811988f82c182012704942d333ee7800f4a78349 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Thu, 27 Feb 2020 17:06:41 -0600 Subject: Modfy expression to match mpicc build with Intel as intel compiler, not gcc. --- config/gnu-cxxflags | 2 +- 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'` -- cgit v0.12