diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-03-25 17:51:42 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-03-25 17:51:42 (GMT) |
| commit | 23f357c1addfe7edbccbf0b804b7b29c12b5049c (patch) | |
| tree | 08f5def085732f0839ce19ee567eef8374e0bfd5 | |
| parent | 14d20880efb6029420ff7c9fd55da4ee26893098 (diff) | |
| download | SCons-23f357c1addfe7edbccbf0b804b7b29c12b5049c.zip SCons-23f357c1addfe7edbccbf0b804b7b29c12b5049c.tar.gz SCons-23f357c1addfe7edbccbf0b804b7b29c12b5049c.tar.bz2 | |
added more default mingw paths per comments on pull request
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index de493f0..f2e9442 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -43,6 +43,14 @@ import SCons.Tool import SCons.Util +mingw_paths = [ + r'c:\MinGW\bin', + r'C:\cygwin64\bin', + r'C:\msys64', + r'C:\cygwin\bin', + r'C:\msys', +] + def shlib_generator(target, source, env, for_signature): cmd = SCons.Util.CLVar(['$SHLINK', '$SHLINKFLAGS']) @@ -111,7 +119,7 @@ key_program = 'mingw32-gcc' def generate(env): - mingw = SCons.Tool.find_program_path(env, key_program, default_paths=[r'c:\MinGW\bin',]) + mingw = SCons.Tool.find_program_path(env, key_program, default_paths=mingw_paths) if mingw: mingw_bin_dir = os.path.dirname(mingw) env.AppendENVPath('PATH', mingw_bin_dir) @@ -156,7 +164,7 @@ def generate(env): env['PROGSUFFIX'] = '.exe' def exists(env): - mingw = SCons.Tool.find_program_path(env, key_program, default_paths=[r'c:\MinGW\bin',]) + mingw = SCons.Tool.find_program_path(env, key_program, default_paths=mingw_paths) if mingw: mingw_bin_dir = os.path.dirname(mingw) env.AppendENVPath('PATH', mingw_bin_dir) |