summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-10-01 07:33:23 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-10-01 07:35:12 (GMT)
commit4a65cdd952d5d3325c9be6e55e9f33ca5efa0301 (patch)
treebb0c67b97b0ee7baeeb2d47793f9d9bc5249762d /BuildTools/SCons
parent26e34e9888e4c523741a659055d469c828909cc6 (diff)
parenteedd35c220d6c8788c8ae4921135333a57feb3a0 (diff)
downloadswift-4a65cdd952d5d3325c9be6e55e9f33ca5efa0301.zip
swift-4a65cdd952d5d3325c9be6e55e9f33ca5efa0301.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Set a title on subscription notification popup. Don't rely on CCVERSION being present. Conflicts: BuildTools/SCons/SConstruct
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 366981c..7148f6e 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -180,7 +180,7 @@ else :
env.Append(CXXFLAGS = ["-Wextra", "-Wall", "-Wnon-virtual-dtor", "-Wundef", "-Wold-style-cast", "-Wno-long-long", "-Woverloaded-virtual", "-Wfloat-equal", "-Wredundant-decls"])
if not env.get("allow_warnings", False) :
env.Append(CXXFLAGS = ["-Werror"])
- gccVersion = env["CCVERSION"].split(".")
+ gccVersion = env.get("CCVERSION", "0.0.0").split(".")
if gccVersion >= ["4", "5", "0"] :
env.Append(CXXFLAGS = ["-Wlogical-op"])
if "clang" in env["CC"] :