diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-24 20:02:33 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-24 20:02:33 (GMT) |
commit | 108c7397372751efe5f953c854673cbcfc7356ca (patch) | |
tree | b826ec01ec8dba1e2889021675d11631d8c84b4d /config/linux-gnulibc1 | |
parent | 9e93204a23346a5b7cf5b8673cf50e6ac2497021 (diff) | |
download | hdf5-108c7397372751efe5f953c854673cbcfc7356ca.zip hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.gz hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.bz2 |
1.8 Merge config changes from dev (#1032)
* Merge config changes from dev
* Revert added git file changes
* Merge MS clang needs EHsc flag #1035
Diffstat (limited to 'config/linux-gnulibc1')
-rw-r--r-- | config/linux-gnulibc1 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1 index 0fef161..d952c4e 100644 --- a/config/linux-gnulibc1 +++ b/config/linux-gnulibc1 @@ -199,9 +199,16 @@ if test -z "$CXX"; then CXX_BASENAME=g++ fi +# Figure out Intel CXX compiler flags +# Do this ahead of GNU to avoid icpc being detected as g++ +. $srcdir/config/intel-cxxflags + # Figure out GNU CXX compiler flags . $srcdir/config/gnu-cxxflags +# Figure out PGI CXX compiler flags +. $srcdir/config/pgi-cxxflags + # Figure out Clang CXX compiler flags . $srcdir/config/clang-cxxflags @@ -314,6 +321,9 @@ fi # check if the compiler_version_info is already set if test -z "$cxx_version_info"; then case $CXX in + *pgc++*) + cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'pgc++'` + ;; *g++*) cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\ grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'` @@ -322,10 +332,6 @@ case $CXX in cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\ sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'` ;; - *pgCC*) - cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'pgCC'` - ;; - *mpicxx*) cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 | grep 'version' |\ sed 's/^[a-z0-9]* for //' |\ |