Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-23 21:58:23 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-23 22:02:15 (GMT) |
| commit | b19210aa48e7cea40929593daed997668fe789be (patch) | |
| tree | 53d3174ca2e78f3b0a4400d545721aaca9747f9e /BuildTools/SCons | |
| parent | fbff232c504d7df20ef5afc97904117d08423a79 (diff) | |
| download | swift-b19210aa48e7cea40929593daed997668fe789be.zip swift-b19210aa48e7cea40929593daed997668fe789be.tar.bz2 | |
Remove distcc settings.
Change-Id: I2c5f75aa48429db37d377bb73bb1a8171089dffa
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 1e9770c..0289e92 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -13,8 +13,6 @@ vars.Add('cxxflags', "Extra C++ compiler flags") vars.Add('link', "Linker") vars.Add('linkflags', "Extra linker flags") vars.Add(BoolVariable("ccache", "Use CCache", "no")) -vars.Add(BoolVariable("distcc", "Use DistCC", "no")) -vars.Add('distcc_hosts', "DistCC hosts (overrides DISTCC_HOSTS)") vars.Add(EnumVariable("test", "Compile and run tests", "none", ["none", "all", "unit", "system"])) vars.Add(BoolVariable("optimize", "Compile with optimizations turned on", "no")) vars.Add(BoolVariable("debug", "Compile with debug information", "yes")) @@ -120,14 +118,7 @@ if env["PLATFORM"] == "darwin" : if platform.machine() == "x86_64" : env.Append(LINKFLAGS = ["-arch", "x86_64"]) -# Default compiler flags -if env.get("distcc", False) : - env["ENV"]["HOME"] = os.environ["HOME"] - env["ENV"]["DISTCC_HOSTS"] = os.environ.get("DISTCC_HOSTS", "") - if "distcc_hosts" in env : - env["ENV"]["DISTCC_HOSTS"] = env["distcc_hosts"] - env["CC"] = "distcc gcc" - env["CXX"] = "distcc g++" +# Override the compiler with custom variables set at config time if "cc" in env : env["CC"] = env["cc"] if "cxx" in env : |