diff options
| author | Daniel <dmoody256@gmail.com> | 2019-01-30 18:32:18 (GMT) |
|---|---|---|
| committer | Daniel <dmoody256@gmail.com> | 2019-01-30 18:32:18 (GMT) |
| commit | b68e505d30e5b2f4ed366e6db10cdd14f14b8a80 (patch) | |
| tree | ec8df5001ccda67d362e72789e50c1b5e868d339 /src | |
| parent | 4518d14b9ad05001ad10b6c1e3d066ed8919571c (diff) | |
| download | SCons-b68e505d30e5b2f4ed366e6db10cdd14f14b8a80.zip SCons-b68e505d30e5b2f4ed366e6db10cdd14f14b8a80.tar.gz SCons-b68e505d30e5b2f4ed366e6db10cdd14f14b8a80.tar.bz2 | |
check to make sure that the CCFLAGS are a CLVar
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index c495041..ce31f88 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/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,8 +173,6 @@ 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)} $)' |