[lmi-commits] [lmi] master 32a5b45 4/5: Fix defect introduced 20210301T1708Z: feckless warnings

[Greg Chicares]

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

    Fix defect introduced 20210301T1708Z: feckless warnings
    
    Commit 472628e703bc1 of 20210301T1708Z ostensibly added some warning
    options that never actually had any effect. See:
      https://lists.nongnu.org/archive/html/lmi/2021-10/msg00025.html
---
 workhorse.make | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index 99f3645..e1828d0 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -478,8 +478,11 @@ else ifneq (,$(filter $(gcc_version), 8 8.1.0 8.2.0 8.3.0 
9 9.3.0))
 
   cxx_standard := -fno-ms-extensions -frounding-math -std=c++2a
 else ifneq (,$(filter $(gcc_version), 10 10.0))
-  gcc_version_specific_c_warnings   :=
-  gcc_version_specific_cxx_warnings :=
+  gcc_version_specific_c_warnings :=
+
+  gcc_version_specific_cxx_warnings := \
+    -Wredundant-tags \
+    -Wvolatile \
 
   ifeq (x86_64-w64-mingw32,$(findstring x86_64-w64-mingw32,$(LMI_TRIPLET)))
 # See:
@@ -496,14 +499,11 @@ else ifneq (,$(filter $(gcc_version), 10 10.0))
     endif
   endif
 
-  gcc_cxx_warnings += -Wredundant-tags -Wvolatile
-
   cxx_standard := -fno-ms-extensions -frounding-math -std=c++20
 else ifneq (,$(filter $(gcc_version), 11 11.0))
-  gcc_version_specific_c_warnings   :=
-  gcc_version_specific_cxx_warnings :=
+  gcc_version_specific_c_warnings :=
 
-  gcc_cxx_warnings += \
+  gcc_version_specific_cxx_warnings := \
     -Wno-deprecated-enum-float-conversion \
     -Wredundant-tags \
     -Wvolatile \