diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-12-27 05:05:25 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-12-27 05:05:25 (GMT) |
| commit | a251629aa5e103f357f7d13b2920cbce59853d3f (patch) | |
| tree | b87e71f0e853846e9d8c35ce932b75e3e2cfaeaf | |
| parent | be9faad84daa0ad459e84c676c48b14816c1d247 (diff) | |
| download | SCons-a251629aa5e103f357f7d13b2920cbce59853d3f.zip SCons-a251629aa5e103f357f7d13b2920cbce59853d3f.tar.gz SCons-a251629aa5e103f357f7d13b2920cbce59853d3f.tar.bz2 | |
Fix mingw to reset _SHLIBSUFFIX to
| -rw-r--r-- | SCons/Tool/mingw.py | 3 | ||||
| -rw-r--r-- | test/MinGW/MinGWSharedLibrary.py | 1 |
2 files changed, 4 insertions, 0 deletions
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') |