summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-06-19 10:17:40 (GMT)
committerTobias Markmann <tm@ayena.de>2017-06-21 15:56:21 (GMT)
commit44917c5f63ee2373b65911ea953d19fc0d1f3272 (patch)
treeaf296ec2eef9197e337fefc9a559b2ca3e683d5b /BuildTools/SCons
parent027111dcd9f5812342066d3bd3e1dbb1f46b3c95 (diff)
downloadswift-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')
-rw-r--r--BuildTools/SCons/SConscript.boot6
-rw-r--r--BuildTools/SCons/Tools/Test.py2
-rw-r--r--BuildTools/SCons/Tools/qt4.py2
3 files changed, 7 insertions, 3 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index d603ef4..f815bbc 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -342,7 +342,7 @@ elif env["PLATFORM"] == "sunos" :
#env.Append(CXXFLAGS = ["-z verbose"])
pass
else :
- if os.path.basename(env["CXX"]) in ["clang", "clang++"] :
+ if os.path.basename(env["CXX"]).startswith(("clang", "clang++")) :
env.Append(CXXFLAGS = [
"-Weverything",
"-Wno-unknown-warning-option", # To stay compatible between CLang versions
@@ -360,6 +360,10 @@ else :
"-Wno-missing-variable-declarations", # Getting rid of CPPUnit warnings
"-Wno-direct-ivar-access", # Obj-C code warning
"-Wno-potentially-evaluated-expression", # Caused due to calling shared_ptr::get() inside typeid()
+
+ "-Wno-inconsistent-missing-destructor-override", # FIXME: fix source code issues regarding this warning later
+ "-Wno-shadow-field", # FIXME: fix source code issues regarding this warning later
+ "-Wno-unused-template", # FIXME: fix source code issues regarding this warning later
])
else :
env.Append(CXXFLAGS = ["-Wextra", "-Wall", "-Wnon-virtual-dtor", "-Wundef", "-Wold-style-cast", "-Wno-long-long", "-Woverloaded-virtual", "-Wfloat-equal", "-Wredundant-decls", "-Wno-unknown-pragmas"])
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"