summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-08-28 14:48:30 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-08-28 14:48:30 (GMT)
commit5bb4ce27cb8335384236970a7b17b3c4258acaca (patch)
tree203caeea27920fe3454a2697cd4e9ec865214aad /BuildTools/SCons
parenteba9a50f10082430c38b849b6af95f92f3de6ef8 (diff)
downloadswift-5bb4ce27cb8335384236970a7b17b3c4258acaca.zip
swift-5bb4ce27cb8335384236970a7b17b3c4258acaca.tar.bz2
Don't rely on CCVERSION being present.
Resolves: #911 Release-Notes: Fixed build problem when GCC version can't be determined.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index bc7781b..7c172f4 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -176,7 +176,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(CCFLAGS = ["-Wlogical-op"])