diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-06-09 21:12:31 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-06-09 21:12:31 (GMT) |
| commit | 32c353ed4360630646e0bfd40387aa7b4fd403ea (patch) | |
| tree | fa0e9e0638459b9f66a472344b82c4b7ad1cddfb | |
| parent | bc51dea95ac97884874a5a8dbf06d90e61ffa0aa (diff) | |
| download | hdf5-32c353ed4360630646e0bfd40387aa7b4fd403ea.zip hdf5-32c353ed4360630646e0bfd40387aa7b4fd403ea.tar.gz hdf5-32c353ed4360630646e0bfd40387aa7b4fd403ea.tar.bz2 | |
Update new clang files to not pick up clang as vendor for pgCC.
Add new files to MANIFEST
Temporary demotion of 2 -Werror warning flags that fail on macos 10.12
Remove Production flag unknown to Apple clang.
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | config/clang-cxxflags | 13 | ||||
| -rw-r--r-- | config/clang-flags | 13 | ||||
| -rw-r--r-- | config/clang-warnings/error-general | 9 |
4 files changed, 19 insertions, 18 deletions
@@ -119,6 +119,8 @@ ./config/apple ./config/cce-fflags ./config/cce-flags +./config/clang-cxxflags +./config/clang-flags ./config/commence.am ./config/conclude.am ./config/conclude_fc.am diff --git a/config/clang-cxxflags b/config/clang-cxxflags index 9c283cd..188570e 100644 --- a/config/clang-cxxflags +++ b/config/clang-cxxflags @@ -64,10 +64,11 @@ if test "X-" = "X-$cxx_flags_set"; then else cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -v 2>&1 |\ grep 'Apple LLVM version' | sed 's/.*Apple LLVM version \([-a-z0-9\.]*\).*/\1/'`" - cxx_vendor="Apple LLVM" + if test -n "$cxx_version"; then + cxx_vendor="Apple LLVM" + fi fi if test "X-" != "X-$cxx_version"; then - echo "compiler '$CXX' is $cxx_vendor-$cxx_version" # Get the compiler version numbers cxx_vers_major=`echo $cxx_version | cut -f1 -d.` @@ -131,11 +132,7 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then ############## # NDEBUG is handled explicitly by the configure script - if test $cxx_vers_major -le 4; then - PROD_CXXFLAGS= - else - PROD_CXXFLAGS="-fstdarg-opt" - fi + PROD_CXXFLAGS= ######### # Debug # @@ -153,7 +150,7 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then # Symbols # ########### - NO_SYMBOLS_CXXFLAGS="-s" + NO_SYMBOLS_CXXFLAGS= SYMBOLS_CXXFLAGS="-g -fno-omit-frame-pointer" ############# diff --git a/config/clang-flags b/config/clang-flags index e7ade49..18ec5f6 100644 --- a/config/clang-flags +++ b/config/clang-flags @@ -64,10 +64,11 @@ if test "X-" = "X-$cc_flags_set"; then else cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 |\ grep 'Apple LLVM version' | sed 's/.*Apple LLVM version \([-a-z0-9\.]*\).*/\1/'`" - cc_vendor="Apple LLVM" + if test -n "$cc_version"; then + cc_vendor="Apple LLVM" + fi fi if test "X-" != "X-$cc_version"; then - echo "compiler '$CC' is $cc_vendor-$cc_version" # Get the compiler version numbers cc_vers_major=`echo $cc_version | cut -f1 -d.` @@ -131,11 +132,7 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then ############## # NDEBUG is handled explicitly by the configure script - if test $cc_vers_major -le 4; then - PROD_CFLAGS= - else - PROD_CFLAGS="-fstdarg-opt" - fi + PROD_CFLAGS= ######### # Debug # @@ -153,7 +150,7 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then # Symbols # ########### - NO_SYMBOLS_CFLAGS="-s" + NO_SYMBOLS_CFLAGS= SYMBOLS_CFLAGS="-g" ############# diff --git a/config/clang-warnings/error-general b/config/clang-warnings/error-general index a9aa516..558d740 100644 --- a/config/clang-warnings/error-general +++ b/config/clang-warnings/error-general @@ -4,15 +4,20 @@ # -Werror=bad-function-cast -Werror=implicit-function-declaration --Werror=incompatible-pointer-types +#-Werror=incompatible-pointer-types -Werror=missing-declarations -Werror=packed -Werror=shadow --Werror=sometimes-uninitialized +#-Werror=sometimes-uninitialized -Werror=switch # #-Werror=discarded-qualifiers # +# Note: For macos 10.12, etc +# H5Dint.c,H5Dchunk.c,H5Gint.c +# -Wincompatible-pointer-types-discards-qualifiers +# # H5Dvirtual.c,H5SL.c +# -Wsometimes-uninitialized # # NOTE: File Driver files are not compatible with these warnings as errors # H5FDdirect.c,H5FDmpio.c,H5FDros3.c, |