Merge c2dc898 into e44c771

Author: dmoody256

src/CHANGES.txt

@@ -30,6 +30,8 @@ RELEASE 3.0.4 - Mon, 20 Jan 2019 22:49:27 +0000
       Issues #3268 & Issue #3222
     - Initial support for ARM targets with Visual Studio 2017 - Issue #3182 (You must set TARGET_ARCH for this to work)
     - Update TempFileMunge class to use PRINT_CMD_LINE_FUNC
+    - Update link tool to convert target to node before accessing node member
+    - Update mingw tool to remove MSVC like nologo CCFLAG
 
   From Tobias Herzog
     - Enhance cpp scanner regex logic to detect if/elif expressions without whitespaces but

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:

src/engine/SCons/Tool/mingw.py

@@ -150,6 +150,7 @@ def generate(env):
 
     #... but a few things differ:
     env['CC'] = 'gcc'
+    env['CCFLAGS'] = SCons.Util.CLVar('')
     env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
     env['CXX'] = 'g++'
     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
@@ -167,7 +168,6 @@ def generate(env):
 
     env['SHOBJSUFFIX'] = '.o'
     env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
-
     env['RC'] = 'windres'
     env['RCFLAGS'] = SCons.Util.CLVar('')
     env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'