Add flags from config/clang-warnings/*general files to H5 C and CXX flags for all versions of Clang and Clang++ compilers.

Switched from cut to awk in testcheck_version.sh.in to avoid dependence
on tab vs. " " in version definitions in H5public.h.

5 files changed, 5 insertions, 75 deletions

diff --git a/config/clang-cxxflags b/config/clang-cxxflags
index c6b84c4..9c283cd 100644
--- a/config/clang-cxxflags
+++ b/config/clang-cxxflags
@@ -183,12 +183,8 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
     # General #
     ###########
 
-    if test $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 2 -o $cxx_vers_major -gt 4; then
-        H5_CXXFLAGS="$H5_CXXFLAGS $(load_clang_arguments general)"
-    fi
-#    if test $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 8 -o $cxx_vers_major -gt 4; then
-#        H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_clang_arguments error-general)"
-#    fi
+    H5_CXXFLAGS="$H5_CXXFLAGS $(load_clang_arguments general)"
+    H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_clang_arguments error-general)"
 
 echo "H5_CXXFLAGS:  $H5_CXXFLAGS"
 
diff --git a/config/clang-flags b/config/clang-flags
index 32c29d4..e7ade49 100644
--- a/config/clang-flags
+++ b/config/clang-flags
@@ -183,12 +183,8 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
     # General #
     ###########
 
-    if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 2 -o $cc_vers_major -gt 4; then
-        H5_CFLAGS="$H5_CFLAGS $(load_clang_arguments general)"
-    fi
-#    if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8 -o $cc_vers_major -gt 4; then
-#        H5_ECFLAGS="$H5_ECFLAGS $(load_clang_arguments error-general)"
-#    fi
+    H5_CFLAGS="$H5_CFLAGS $(load_clang_arguments general)"
+    H5_ECFLAGS="$H5_ECFLAGS $(load_clang_arguments error-general)"
 
 echo "H5_CFLAGS:  $H5_CFLAGS"
 
diff --git a/config/clang-warnings/cxx-error-general b/config/clang-warnings/cxx-error-general
deleted file mode 100644
index 85cd9a3..0000000
--- a/config/clang-warnings/cxx-error-general
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# HDF5 code should not trigger the following warnings under any
-# circumstances, so ask the compiler to treat them as errors:
-#
-# NOTE: c++/test files are not compatible with these warnings as errors
-#     c++/test/tcompound.cpp
-#       -Werror=cast-align
--Wcast-align
-# NOTE: c++/src files are not compatible with these warnings as errors
-#     c++/src/H5Object.cpp
-#       -Werror=missing-declarations
--Wmissing-declarations
--Werror=packed
--Werror=redundant-decls
--Werror=switch
-# NOTE: c++/test files are not compatible with these warnings as errors
-#     c++/test/tattr.cpp
-#       -Werror=unused-but-set-variable
--Wunused-but-set-variable
--Werror=unused-function
--Werror=unused-variable
-# NOTE: c++/src files are not compatible with these warnings as errors
-#     c++/src/H5Object.cpp,c++/src/H5StrType.cpp,c++/src/H5PredType.cpp
-#       -Werror=unused-parameter
--Wunused-parameter
-#
-# Other files not compatible
-# NOTE: c++/test files are not compatible with these warnings as errors
-#     c++/test/titerate.cpp,c++/test/tarray.cpp
-#       -Werror=missing-declarations
-#     c++/test/titerate.cpp,c++/test/tarray.cpp,c++/test/tlinks.cpp,c++/test/ttypes.cpp,c++/test/dsets.cpp
-#       -Werror=unused-parameter
diff --git a/config/clang-warnings/cxx-general b/config/clang-warnings/cxx-general
deleted file mode 100644
index 9548cc0..0000000
--- a/config/clang-warnings/cxx-general
+++ /dev/null
@@ -1,31 +0,0 @@
-# Note that some of the flags listed here really should be developer
-# flags (listed in separate files, gnu-warnings-developer*) but we put
-# them here because they are not raised by the current code and we'd like to
-# know if they do start showing up.
-#
-# NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
-# warnings that are emitted. If you need it, add it from the
-# environment variable at configure time.
--Wall
--Wcast-qual
--Wconversion
--Wctor-dtor-privacy
--Weffc++
--Wextra
--Wfloat-equal
--Wformat=2
--Winit-self
--Winvalid-pch
--Wmissing-include-dirs
--Wno-format-nonliteral
--Wnon-virtual-dtor
--Wold-style-cast
--Woverloaded-virtual
--Wreorder
--Wshadow
--Wsign-promo
-##-Wunreachable-code
--Wundef
-##-Wvariadic-macros
--Wwrite-strings
--pedantic
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 1a12006..055b075 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -65,6 +65,7 @@ if test "X-" = "X-$FC"; then
             FC_BASENAME=mpif90
             ;;
         clang*)
+            # clang has no fortran compiler. Use gfortran.
             FC=gfortran
             FC_BASENAME=gfortran
             ;;