summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-08-25 16:39:06 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-08-27 19:47:48 (GMT)
commit1bb607f96e79845ce30dd5590b0d53cc394ac150 (patch)
tree6156622ddd1b3238aec73536e0dc25b632965a71 /BuildTools
parentc4431ee90f3f1daac0a12b35bfa3378d5c570eaa (diff)
downloadswift-1bb607f96e79845ce30dd5590b0d53cc394ac150.zip
swift-1bb607f96e79845ce30dd5590b0d53cc394ac150.tar.bz2
PubSub implementation & Sluift refactoring.
Change-Id: I04ff7111b73565c00bff6db183451774a633344f
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConscript.boot4
-rw-r--r--BuildTools/SCons/SConstruct1
2 files changed, 2 insertions, 3 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index f1341d1..9c78bc0 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -247,9 +247,7 @@ if env["PLATFORM"] == "posix" and platform.machine() == "x86_64" :
# Warnings
if env["PLATFORM"] == "win32" :
- # TODO: Find the ideal set of warnings
- #env.Append(CCFLAGS = ["/Wall"])
- pass
+ env.Append(CXXFLAGS = ["/wd4068"])
else :
if "clang" in env["CXX"] :
env.Append(CXXFLAGS = [
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 8f4d440..f3c4e5e 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -570,6 +570,7 @@ else :
if ARGUMENTS.get("dump_trace", False) :
env.SetOption("no_exec", True)
env["TEST"] = True
+ env["BOOST_BUILD_BCP"] = True
env.Decider(lambda x, y, z : True)
SCons.Node.Python.Value.changed_since_last_build = (lambda x, y, z: True)