[lmi-commits] [lmi] master b8061ca 3/7: Treat gcc versions "10" and "10.0" as the same

[Greg Chicares]

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

    Treat gcc versions "10" and "10.0" as the same
    
    They presumably mean just about the same thing, but...
    
    https://lists.nongnu.org/archive/html/lmi/2020-10/msg00031.html
    | gcc under Linux has apparently switched to reporting only the
    | major version in -dumpversion since version 7
    
    while major.minor.patchlevel is reported by MinGW-w64.
    
    '-dumpversion' should report major.minor.patchlevel always, but
    only since it was introduced (apparently around gcc-7).
---
 workhorse.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index d045e72..0ae1806 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -418,7 +418,7 @@ else ifneq (,$(filter $(gcc_version), 7.2.0 7.3.0))
   gcc_version_specific_warnings := \
 
   cxx_standard := -fno-ms-extensions -frounding-math -std=c++17
-else ifneq (,$(filter $(gcc_version), 8.1.0 8.2.0 8.3.0 9.3.0 10.0))
+else ifneq (,$(filter $(gcc_version), 8.1.0 8.2.0 8.3.0 9.3.0 10 10.0))
   gcc_version_specific_warnings := \
 
   ifeq (x86_64-w64-mingw32,$(findstring x86_64-w64-mingw32,$(LMI_TRIPLET)))
@@ -427,7 +427,7 @@ else ifneq (,$(filter $(gcc_version), 8.1.0 8.2.0 8.3.0 
9.3.0 10.0))
     tutelary_flag := -fomit-frame-pointer
   endif
 
-  ifneq (,$(filter $(gcc_version), 10.0))
+  ifneq (,$(filter $(gcc_version), 10 10.0))
     gcc_cxx_warnings += -Wredundant-tags -Wvolatile
   endif