Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-09 13:19:04 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-22 14:25:29 (GMT) |
| commit | ba7a4cbf494f39d08717084c61ee865609b96619 (patch) | |
| tree | 85522b06b63ba08e57be86d5b18f2c11d2f41dbe /BuildTools | |
| parent | 67aa40ce209831a651a852d5bb2a083f21900e08 (diff) | |
| download | swift-ba7a4cbf494f39d08717084c61ee865609b96619.zip swift-ba7a4cbf494f39d08717084c61ee865609b96619.tar.bz2 | |
Provide 'cxxflags' configuration variable.
Change-Id: I6009b99608491ba5f05de179d740b44c4371bd27
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 56a3dd1..0c33f06 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -8,7 +8,8 @@ sys.path.append(Dir("#/BuildTools/SCons").abspath) vars = Variables(os.path.join(Dir("#").abspath, "config.py")) vars.Add('cc', "C compiler") vars.Add('cxx', "C++ compiler") -vars.Add('ccflags', "Extra C(++) compiler flags") +vars.Add('ccflags', "Extra C/C++/ObjC compiler flags") +vars.Add('cxxflags', "Extra C++ compiler flags") vars.Add('link', "Linker") vars.Add('linkflags', "Extra linker flags") vars.Add(BoolVariable("ccache", "Use CCache", "no")) @@ -123,6 +124,7 @@ if isinstance(ccflags, str) : env["CCFLAGS"] = ccflags.split(" ") else : env["CCFLAGS"] = ccflags +env["CXXFLAGS"] = env.get("cxxflags", []) if "link" in env : env["SHLINK"] = env["link"] env["LINK"] = env["link"] |