[lmi-commits] [lmi] master c418323 3/5: Provisionally allow a newer gcc version

[Greg Chicares]

branch: master
commit c4183233c3fc2d7a72f905451e69791a22baa76c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Provisionally allow a newer gcc version
---
 workhorse.make | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index d779be3..2ba7465 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -129,16 +129,16 @@ effective_default_target: $(default_targets)
 
################################################################################
 
 # $(subst): workaround for debian, whose MinGW-w64 identifies its
-# version 7.2.0 as "7.2-win32".
+# version 7.x.0 as "7.x-win32".
 
 ifeq (gcc,$(toolset))
-  gcc_version   := $(subst 7.2-win32,7.2.0,$(shell $(CXX)     -dumpversion))
+  gcc_version   := $(subst -win32,.0,$(shell $(CXX)     -dumpversion))
 endif
 
 # These are defined even for toolsets other than gcc.
 
-gnu_cpp_version := $(subst 7.2-win32,7.2.0,$(shell $(GNU_CPP) -dumpversion))
-gnu_cxx_version := $(subst 7.2-win32,7.2.0,$(shell $(GNU_CXX) -dumpversion))
+gnu_cpp_version := $(subst -win32,.0,$(shell $(GNU_CPP) -dumpversion))
+gnu_cxx_version := $(subst -win32,.0,$(shell $(GNU_CXX) -dumpversion))
 
 ifeq      (3.4.4,$(gnu_cpp_version))
 else ifeq (3.4.5,$(gnu_cpp_version))
@@ -146,6 +146,7 @@ else ifeq (4.9.1,$(gnu_cpp_version))
 else ifeq (4.9.2,$(gnu_cpp_version))
 else ifeq (6.3.0,$(gnu_cpp_version))
 else ifeq (7.2.0,$(gnu_cpp_version))
+else ifeq (7.3.0,$(gnu_cpp_version))
 else
   $(warning Untested $(GNU_CPP) version '$(gnu_cpp_version)')
 endif
@@ -156,6 +157,7 @@ else ifeq (4.9.1,$(gnu_cxx_version))
 else ifeq (4.9.2,$(gnu_cxx_version))
 else ifeq (6.3.0,$(gnu_cxx_version))
 else ifeq (7.2.0,$(gnu_cxx_version))
+else ifeq (7.3.0,$(gnu_cxx_version))
 else
   $(warning Untested $(GNU_CXX) version '$(gnu_cxx_version)')
 endif
@@ -406,7 +408,7 @@ else ifneq (,$(filter $(gcc_version), 6.3.0))
   #   http://lists.nongnu.org/archive/html/lmi/2017-08/msg00045.html
   c_standard   += -frounding-math
   cxx_standard += -frounding-math
-else ifneq (,$(filter $(gcc_version), 7.2.0))
+else ifneq (,$(filter $(gcc_version), 7.2.0 7.3.0))
   # Rationale:
   # -Wno-conversion             regrettable, but needed for wx
   # -Wno-parentheses            beyond pedantic