Merge pull request #3270 from dmoody256/mingw_link_issue

Mingw link issue

.appveyor.yml

@@ -17,7 +17,8 @@ install:
   # add python and python user-base to path for pip installs
   - cmd: "C:\\%WINPYTHON%\\python.exe --version"
   - cmd: for /F "tokens=*" %%g in ('C:\\%WINPYTHON%\\python.exe -m site --user-site') do (set PYSITEDIR=%%g)
-  - cmd: "set PATH=C:\\%WINPYTHON%;C:\\%WINPYTHON%\\Scripts;C:\\cygwin64\\bin;C:\\msys64;C:\\ProgramData\\chocolatey\\bin;%PATH%"
+  # use mingw 32 bit until #3291 is resolved
+  - cmd: "set PATH=C:\\%WINPYTHON%;C:\\%WINPYTHON%\\Scripts;C:\\MinGW\\bin;C:\\MinGW\\msys\\1.0\\bin;C:\\cygwin\\bin;C:\\ProgramData\\chocolatey\\bin;%PATH%"
   - cmd: "C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off pip setuptools wheel "
   - cmd: "C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off pypiwin32 coverage codecov"
   - cmd: set STATIC_DEPS=true & C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off lxml

src/CHANGES.txt

@@ -42,6 +42,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,12 @@ def generate(env):
 
     #... but a few things differ:
     env['CC'] = 'gcc'
+    # make sure the msvc tool doesnt break us, it added a /flag
+    if 'CCFLAGS' in env:
+        # make sure its a CLVar to handle list or str cases
+        if type(env['CCFLAGS']) is not SCons.Util.CLVar:
+            env['CCFLAGS'] = SCons.Util.CLVar(env['CCFLAGS'])
+        env['CCFLAGS'] = SCons.Util.CLVar(str(env['CCFLAGS']).replace('/nologo', ''))
     env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
     env['CXX'] = 'g++'
     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
@@ -167,7 +173,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)} $)'

test/Win32/msvc_mingw_env.py

@@ -0,0 +1,102 @@
+"""
+This tests the MinGW  with MSVC tool.
+"""
+
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import sys
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+# MinGW is Windows only:
+if sys.platform != 'win32':
+    msg = "Skipping mingw test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
+test.skip_if_not_msvc()
+
+# control test: check for nologo and cl in env
+test.write('SConstruct',"""
+env=Environment(tools=['default'])
+print('CCFLAGS=' + str(env['CCFLAGS']).strip())
+print('CC=' + str(env['CC']).strip())
+""")
+test.run(arguments='-Q -s')
+if('CCFLAGS=/nologo' not in test.stdout()
+    or 'CC=cl' not in test.stdout()):
+    test.fail_test()
+
+# make sure windows msvc doesnt add bad mingw flags 
+# and that gcc is selected
+test.write('SConstruct',"""
+env=Environment(tools=['default', 'mingw'])
+print('CCFLAGS="' +  str(env['CCFLAGS']).strip() + '"')
+print('CC=' +  str(env['CC']).strip())
+""")
+test.run(arguments='-Q -s')
+if('CCFLAGS=""' not in test.stdout()
+    or 'CC=gcc' not in test.stdout()):
+    test.fail_test()
+
+# msvc should overwrite the flags and use cl
+test.write('SConstruct',"""
+env=Environment(tools=['mingw', 'default'])
+print('CCFLAGS=' + str(env['CCFLAGS']).strip())
+print('CC=' + str(env['CC']).strip())
+""")
+test.run(arguments='-Q -s')
+if('CCFLAGS=/nologo' not in test.stdout()
+    or 'CC=cl' not in test.stdout()):
+    test.fail_test()
+
+# test that CCFLAGS are preserved
+test.write('SConstruct',"""
+env=Environment(tools=['mingw'], CCFLAGS='-myflag')
+print(env['CCFLAGS'])
+""")
+test.run(arguments='-Q -s')
+if '-myflag' not in test.stdout():
+    test.fail_test()
+
+# test that it handles a list
+test.write('SConstruct',"""
+env=Environment(tools=['mingw'], CCFLAGS=['-myflag', '-myflag2'])
+print(str(env['CCFLAGS']))
+""")
+test.run(arguments='-Q -s')
+if "['-myflag', '-myflag2']" not in test.stdout():
+    test.fail_test()
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: