diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-03-25 17:41:06 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-03-25 17:41:06 (GMT) |
| commit | 14d20880efb6029420ff7c9fd55da4ee26893098 (patch) | |
| tree | ecf0e11aee18e6b59b074234154864ba9eb5c506 | |
| parent | 0cefc2bf199dd56d16b752042f9569a420b6ddab (diff) | |
| download | SCons-14d20880efb6029420ff7c9fd55da4ee26893098.zip SCons-14d20880efb6029420ff7c9fd55da4ee26893098.tar.gz SCons-14d20880efb6029420ff7c9fd55da4ee26893098.tar.bz2 | |
Fix clang and mingw tests
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 7 | ||||
| -rw-r--r-- | test/import.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index 4121902..de493f0 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -156,7 +156,12 @@ def generate(env): env['PROGSUFFIX'] = '.exe' def exists(env): - return find(env) + mingw = SCons.Tool.find_program_path(env, key_program, default_paths=[r'c:\MinGW\bin',]) + if mingw: + mingw_bin_dir = os.path.dirname(mingw) + env.AppendENVPath('PATH', mingw_bin_dir) + + return mingw # Local Variables: # tab-width:4 diff --git a/test/import.py b/test/import.py index b6e5a8d..11fee9c 100644 --- a/test/import.py +++ b/test/import.py @@ -75,6 +75,8 @@ ignore = ('__init__.py', '386asm.py', 'linkloc.py', # Directory of common stuff for MSVC and MSVS 'MSCommon', + # clang common + "clangCommon", # Sun pkgchk and pkginfo common stuff 'sun_pkg.py', # RPM utilities |