summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-05-31 06:12:48 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-06-02 11:09:12 (GMT)
commit2889e10d0d9ecb0339ec03d71416718580433092 (patch)
treedb4f160e9c751e1ccae3709c037765227aa869bd /BuildTools/SCons
parent7c629981cc73febae77fbd39ad9901c873b248b0 (diff)
downloadswift-2889e10d0d9ecb0339ec03d71416718580433092.zip
swift-2889e10d0d9ecb0339ec03d71416718580433092.tar.bz2
Implement allow_warnings SCons flag for Windows
Test-Information: Build failed correctly on error on Windows 8 with Visual Studio 2013. Change-Id: I1afc7a8a4cf0449057959638709c80c7ded8a5a6
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot2
1 files changed, 2 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index df15937..5fc99f3 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -307,6 +307,8 @@ if env["PLATFORM"] == "posix" and platform.machine() in ["x86_64", "amd64"] :
# Warnings
if env["PLATFORM"] == "win32" :
env.Append(CXXFLAGS = ["/wd4068"])
+ if not env.get("allow_warnings", "False") :
+ env.Append(CXXFLAGS = ["/WX"])
elif env["PLATFORM"] == "hpux" :
# HP-UX gives a flood of minor warnings if this is enabled
#env.Append(CXXFLAGS = ["+w"])