summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-03-14 11:27:29 (GMT)
committerTobias Markmann <tm@ayena.de>2016-03-14 16:00:29 (GMT)
commit8cdebcff1d1e8321b070c7e675f9a9709a2b0b81 (patch)
tree2be3bc1fb4636f208e4a872c213b8e18fa1bb45f /3rdParty
parentfcb5204aeacd6c4bf49223f133df285f22f7cd4b (diff)
downloadswift-8cdebcff1d1e8321b070c7e675f9a9709a2b0b81.zip
swift-8cdebcff1d1e8321b070c7e675f9a9709a2b0b81.tar.bz2
Build all Swift projects as C++11
Added a SCons compiler test so that the build process fails early if C++11 is not supported. Remove C++11 checks as we now default to C++11 and they are not needed anymore. Ignore a Clang warning if building 3rdParty Boost. Test-Information: Tested build and unit tests on OS X 10.11.3. Change-Id: Icbecbd1e25e8d8bbe5f402f75355373a86b5f8a1
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/Boost/SConscript6
1 files changed, 6 insertions, 0 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index d56f5e3..b3ed153 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -1,3 +1,5 @@
+import os
+
Import("env")
# FIXME: Remove this when Boost UUID is present on most distros
@@ -54,6 +56,10 @@ elif env.get("BOOST_BUNDLED", False) :
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")])
+ if os.path.basename(env["CXX"]) in ["clang", "clang++"] :
+ myenv.Append(CXXFLAGS = [
+ "-Wno-deprecated-register", # The register keyword will be reserved in C++17, we only use C++11 though.
+ ])
sources = [
"src/libs/atomic/src/lockpool.cpp",