From fdd366414c56cb8dd754daf8aea041bdcb9e0cb0 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 13 Jan 2019 22:52:01 -0600 Subject: fixed mingw emitter to convert str to node before accessing node member, and updated mingw to remove MSVC like nologo flag --- src/engine/SCons/Tool/link.py | 2 ++ src/engine/SCons/Tool/mingw.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index 5adc6ca..5d920fb 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -81,6 +81,8 @@ def _lib_emitter(target, source, env, **kw): if Verbose: print("_lib_emitter: target[0]={!r}".format(target[0].get_path())) for tgt in target: + if SCons.Util.is_String(tgt): + tgt = env.File(tgt) tgt.attributes.shared = 1 try: diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index 738460d..c495041 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -167,7 +167,8 @@ def generate(env): env['SHOBJSUFFIX'] = '.o' env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 - + if 'CCFLAGS' in env: + env['CCFLAGS'] = SCons.Util.CLVar(str(env['CCFLAGS']).replace('/nologo', '')) env['RC'] = 'windres' env['RCFLAGS'] = SCons.Util.CLVar('') env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)' -- cgit v0.12