Swiftdiff options
Diffstat (limited to 'BuildTools/SCons/Tools')
| -rw-r--r-- | BuildTools/SCons/Tools/Test.py | 2 | ||||
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/Test.py b/BuildTools/SCons/Tools/Test.py index ebf9dc6..2106af4 100644 --- a/BuildTools/SCons/Tools/Test.py +++ b/BuildTools/SCons/Tools/Test.py @@ -21,3 +21,3 @@ def generate(env) : test_env = env.Clone() - for i in ["HOME", "PATH", "USERPROFILE", "APPDATA", "ASAN_OPTIONS", "LSAN_OPTIONS", "SWIFT_NETWORK_TEST_IPV4", "SWIFT_NETWORK_TEST_IPV6"]: + for i in ["HOME", "PATH", "USERPROFILE", "APPDATA", "GTEST_FILTER", "ASAN_OPTIONS", "LSAN_OPTIONS", "SWIFT_NETWORK_TEST_IPV4", "SWIFT_NETWORK_TEST_IPV6"]: if os.environ.get(i, "") : diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index b965e06..d5c14e2 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -479,3 +479,3 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4' include_flag = "-I" - if os.path.basename(self["CC"]) in ("gcc", "clang"): + if os.path.basename(self["CC"]).startswith(("gcc", "clang")): include_flag = "-isystem" |