summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-24 19:18:21 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-24 19:18:21 (GMT)
commit5507db111fceb9831879fd1efabbbe82266aa0dc (patch)
tree103d75fe03f18bd57495ac86c4d8bae8d7dced10 /BuildTools/SCons
parent17b15cb1acb5e082f410766741410fbd0e5d2c0f (diff)
downloadswift-5507db111fceb9831879fd1efabbbe82266aa0dc.zip
swift-5507db111fceb9831879fd1efabbbe82266aa0dc.tar.bz2
Added 'link' flag to SConstruct.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConstruct4
1 files changed, 4 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 4723755..8ff4f0a 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -10,6 +10,7 @@ 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('link', "Linker")
vars.Add('linkflags', "Extra linker flags")
vars.Add(BoolVariable("ccache", "Use CCache", "no"))
vars.Add(BoolVariable("distcc", "Use DistCC", "no"))
@@ -99,6 +100,9 @@ if "cc" in env :
if "cxx" in env :
env["CXX"] = env["cxx"]
env["CCFLAGS"] = env.get("ccflags", [])
+if "link" in env :
+ env["SHLINK"] = env["link"]
+ env["LINK"] = env["link"]
env["LINKFLAGS"] = env.get("linkflags", [])
# This isn't a real flag (yet) AFAIK. Be sure to append it to the CXXFLAGS
# where you need it