Skip to content

Commit

Permalink
fixed mingw emitter to convert str to node before accessing node memb…
Browse files Browse the repository at this point in the history
…er, and updated mingw to remove MSVC like nologo flag
  • Loading branch information
dmoody256 committed Jan 14, 2019
1 parent 0f782d0 commit fdd3664
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/engine/SCons/Tool/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion src/engine/SCons/Tool/mingw.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)} $)'
Expand Down

0 comments on commit fdd3664

Please sign in to comment.