diff options
author | Remko Tronçon <git@el-tramo.be> | 2013-03-04 13:23:10 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2013-03-04 16:03:53 (GMT) |
commit | ca7a45a25c2fe332fad1ee3f7a2822415c249206 (patch) | |
tree | 268c6d37f087935a307061f9d5ef507ddd5162cf /BuildTools/SCons/SConscript.boot | |
parent | 836925a5cdc7017da7fb84416c803e652b48e399 (diff) | |
download | swift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.zip swift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.tar.bz2 |
Qt5 support & warning fixes.
Change-Id: I62c7d5ca44c915e36c797c798294b7c34b465514
Diffstat (limited to 'BuildTools/SCons/SConscript.boot')
-rw-r--r-- | BuildTools/SCons/SConscript.boot | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 4f68b1b..a8b7446 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -54,6 +54,7 @@ vars.Add("sqlite_force_bundled", "Force use of the bundled SQLite", None) vars.Add(PathVariable("avahi_includedir", "Avahi headers location", None, PathVariable.PathAccept)) vars.Add(PathVariable("avahi_libdir", "Avahi library location", None, PathVariable.PathAccept)) vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept)) +vars.Add(BoolVariable("qt5", "Compile in Qt5 mode", "no")) # TODO: auto-detect this vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccept)) vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept)) vars.Add(BoolVariable("build_examples", "Build example programs", "yes")) @@ -117,7 +118,9 @@ if env["PLATFORM"] == "darwin" : env["CCFLAGS"] = ["-arch", "x86_64"] if "cxx" not in env : env["CXX"] = "clang++" - env["CXXFLAGS"] = ["-std=c++11"] + # Compiling Qt5 in C++0x mode includes headers that we don't have + if not env["qt5"] : + env["CXXFLAGS"] = ["-std=c++11"] if "link" not in env : env["LINK"] = "clang" if platform.machine() == "x86_64" : @@ -237,7 +240,7 @@ else : "-Wno-global-constructors", # We depend on this for e.g. string constants "-Wno-disabled-macro-expansion", # Caused due to system headers "-Wno-c++11-extensions", # We use C++11; turn this off when we use -std=c++11 - "-Wno-pedantic", # Fix these when we have time + "-Wno-long-long", # We use long long "-Wno-padded", ]) else : |