From 998c6470d78e14228695419c3b514c35ecf3d69e Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Fri, 12 Jun 2020 11:54:58 -0500
Subject: Remove unnecessary version conditions for Clang compilers.

---
 config/clang-cxxflags | 17 +++--------------
 config/clang-flags    | 17 +++--------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/config/clang-cxxflags b/config/clang-cxxflags
index a37509f..edd62e7 100644
--- a/config/clang-cxxflags
+++ b/config/clang-cxxflags
@@ -140,11 +140,7 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
 
     # NDEBUG is handled explicitly by the configure script
     # -g is handled by the symbols flags
-    if test $cxx_vers_major -le 4; then
-        DEBUG_CXXFLAGS=
-    else
-        DEBUG_CXXFLAGS="-ftrapv -fno-common"
-    fi
+    DEBUG_CXXFLAGS="-ftrapv -fno-common"
 
     ###########
     # Symbols #
@@ -163,13 +159,8 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
     # Optimization #
     ################
 
-    if test $cxx_vers_major -le 4; then
-        HIGH_OPT_CXXFLAGS="-O3"
-        DEBUG_OPT_CXXFLAGS=
-    else
-        HIGH_OPT_CXXFLAGS="-O3"
-        DEBUG_OPT_CXXFLAGS="-g"
-    fi
+    HIGH_OPT_CXXFLAGS="-O3"
+    DEBUG_OPT_CXXFLAGS="-g"
     NO_OPT_CXXFLAGS="-O0"
 
     ############
@@ -183,8 +174,6 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
     H5_CXXFLAGS="$H5_CXXFLAGS $(load_clang_arguments general)"
     H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_clang_arguments error-general)"
 
-echo "H5_CXXFLAGS:  $H5_CXXFLAGS"
-
     ######################
     # Developer warnings #
     ######################
diff --git a/config/clang-flags b/config/clang-flags
index 18ec5f6..b4f5e2e 100644
--- a/config/clang-flags
+++ b/config/clang-flags
@@ -140,11 +140,7 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
 
     # NDEBUG is handled explicitly by the configure script
     # -g is handled by the symbols flags
-    if test $cc_vers_major -le 4; then
-        DEBUG_CFLAGS=
-    else
-        DEBUG_CFLAGS="-ftrapv -fno-common"
-    fi
+    DEBUG_CFLAGS="-ftrapv -fno-common"
 
     ###########
     # Symbols #
@@ -163,13 +159,8 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
     # Optimization #
     ################
 
-    if test $cc_vers_major -le 4; then
-        HIGH_OPT_CFLAGS="-O3"
-        DEBUG_OPT_CFLAGS=
-    else
-        HIGH_OPT_CFLAGS="-O3"
-        DEBUG_OPT_CFLAGS="-g"
-    fi
+    HIGH_OPT_CFLAGS="-O3"
+    DEBUG_OPT_CFLAGS="-g"
     NO_OPT_CFLAGS="-O0"
 
     ############
@@ -183,8 +174,6 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
     H5_CFLAGS="$H5_CFLAGS $(load_clang_arguments general)"
     H5_ECFLAGS="$H5_ECFLAGS $(load_clang_arguments error-general)"
 
-echo "H5_CFLAGS:  $H5_CFLAGS"
-
     ######################
     # Developer warnings #
     ######################
-- 
cgit v0.12