Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-06-19 10:17:40 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-06-21 15:56:21 (GMT) |
| commit | 44917c5f63ee2373b65911ea953d19fc0d1f3272 (patch) | |
| tree | af296ec2eef9197e337fefc9a559b2ca3e683d5b /BuildTools/SCons/Tools | |
| parent | 027111dcd9f5812342066d3bd3e1dbb1f46b3c95 (diff) | |
| download | swift-44917c5f63ee2373b65911ea953d19fc0d1f3272.zip swift-44917c5f63ee2373b65911ea953d19fc0d1f3272.tar.bz2 | |
Add CircleCI configuration for basic GitHub PR checks
This also disables a couple compiler warnings raised by clang
trunk.
Test-Information:
Tested this on my personal GitHub fork of Swift and it works.
Change-Id: I646d3beb9fc0376e0b38ce8e323e5717a899ad45
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 @@ -19,7 +19,7 @@ def generate(env) : # Set environment variables for running the test 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, "") : test_env["ENV"][i] = os.environ[i] if env["target"] == "android" : 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 @@ -477,7 +477,7 @@ 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" |