diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-05 22:08:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 22:08:22 (GMT) |
| commit | 089a6f60ace8f87c049f5e618b77394c2cec2b4c (patch) | |
| tree | a4d2a58bc1af8dc7c34897be88041f20918d9ffc /config | |
| parent | c1da03ef099fdc898e205bf5f80f328daf795421 (diff) | |
| download | hdf5-089a6f60ace8f87c049f5e618b77394c2cec2b4c.zip hdf5-089a6f60ace8f87c049f5e618b77394c2cec2b4c.tar.gz hdf5-089a6f60ace8f87c049f5e618b77394c2cec2b4c.tar.bz2 | |
1 8 Merges from develop (#432)
* Update supported platforms
* Merge PR#3 changes from develop
* # WARNING: head commit changed in the meantime
Merge gcc 10 diagnostics option from develop
Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop
* Format updates
* Fix missing semicolon and format fix
* Format update
* Correct actions, remove java option
* Update autotools build files
* Add testfiles
* Fix configure issue with make flags
* Init fapls to default
* Update generated files and fix h5repack id closure
* update format
* Merges from develop
#358 patches from vtk
#361 fix header guard spelling
* Merges from develop
#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync
* format alignment
* initialize vars
* revert H5private change
* Merge #380 from develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/gnu-cxxflags | 2 | ||||
| -rw-r--r-- | config/gnu-fflags | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags index 3fe13d8..cba8298 100644 --- a/config/gnu-cxxflags +++ b/config/gnu-cxxflags @@ -148,7 +148,7 @@ if test "X-g++" = "X-$cxx_vendor"; then # Enhanced Diagnostics # ######################## - if test $cc_vers_major -ge 10; then + if test $cxx_vers_major -ge 10; then NO_DIAGS_CXXFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color" fi DIAGS_CXXFLAGS= diff --git a/config/gnu-fflags b/config/gnu-fflags index d4f876d..ec4fcab 100644 --- a/config/gnu-fflags +++ b/config/gnu-fflags @@ -109,7 +109,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then # Enhanced Diagnostics # ######################## - if test $cc_vers_major -ge 10; then + if test $f9x_vers_major -ge 10; then NO_DIAGS_FCFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color" fi DIAGS_FCFLAGS= |