[lmi-commits] [lmi] master d810372 3/9: Trade elegance for simplicity

[Greg Chicares]

branch: master
commit d8103724347db1cf4945adeb5fb9dec4e0a8bf23
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Trade elegance for simplicity
    
    $(gcc_cxx_warnings) seems adequate for gcc version-specific warnings:
    $(gcc_version_specific_warnings) hasn't been used since gcc-7. And
    '-Wno-deprecated-enum-float-conversion' is a mere expedient that
    shouldn't be suffered to persist for long, so it appears preferable
    not to add a new $(gxx_version_specific_warnings) variable just for
    this purpose.
---
 workhorse.make | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index b0343f4..a9e5795 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -488,10 +488,12 @@ else ifneq (,$(filter $(gcc_version), 10 10.0))
 
   cxx_standard := -fno-ms-extensions -frounding-math -std=c++20
 else ifneq (,$(filter $(gcc_version), 11 11.0))
-  gxx_version_specific_warnings := \
-    -Wno-deprecated-enum-float-conversion \
+  gcc_version_specific_warnings := \
 
-  gcc_cxx_warnings += -Wredundant-tags -Wvolatile
+  gcc_cxx_warnings += \
+    -Wno-deprecated-enum-float-conversion \
+    -Wredundant-tags \
+    -Wvolatile \
 
   cxx_standard := -fno-ms-extensions -frounding-math -std=c++20
 endif
@@ -571,7 +573,6 @@ gcc_c_warnings := \
 gcc_cxx_warnings := \
   $(cxx_standard) \
   $(gcc_common_warnings) \
-  $(gxx_version_specific_warnings) \
   -Wc++11-compat \
   -Wc++14-compat \
   -Wc++1z-compat \