From a251629aa5e103f357f7d13b2920cbce59853d3f Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sat, 26 Dec 2020 21:05:25 -0800
Subject: Fix mingw to reset _SHLIBSUFFIX to

---
 SCons/Tool/mingw.py              | 3 +++
 test/MinGW/MinGWSharedLibrary.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/SCons/Tool/mingw.py b/SCons/Tool/mingw.py
index 5e2b82f..b8337db 100644
--- a/SCons/Tool/mingw.py
+++ b/SCons/Tool/mingw.py
@@ -187,6 +187,9 @@ def generate(env):
     env['LIBSUFFIX'] = '.a'
     env['PROGSUFFIX'] = '.exe'
 
+    # Handle new versioned shared library logic
+    env['_SHLIBSUFFIX'] = '$SHLIBSUFFIX'
+
 
 def exists(env):
     mingw = SCons.Tool.find_program_path(env, key_program, default_paths=mingw_paths)
diff --git a/test/MinGW/MinGWSharedLibrary.py b/test/MinGW/MinGWSharedLibrary.py
index 86ddd43..badfcb9 100644
--- a/test/MinGW/MinGWSharedLibrary.py
+++ b/test/MinGW/MinGWSharedLibrary.py
@@ -56,6 +56,7 @@ int abc(int a) {
   """)
 
 test.write('SConstruct', """
+DefaultEnvironment(tools=[])
 env = Environment(tools=['mingw','link','g++'])
 #env.Tool('mingw')
 env.SharedLibrary('foobar', 'foobar.cc')
-- 
cgit v0.12