From 14d20880efb6029420ff7c9fd55da4ee26893098 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sun, 25 Mar 2018 13:41:06 -0400
Subject: Fix clang and mingw tests

---
 src/engine/SCons/Tool/mingw.py | 7 ++++++-
 test/import.py                 | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

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
-- 
cgit v0.12