summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-03-27 18:29:47 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-03-27 18:29:47 (GMT)
commit950dfa7923f62297429e49a135e4fb363447366d (patch)
tree9689c271fc2eeebce0de6bdb854f716c8dc9c1f6 /BuildTools/SCons
parent8e444296d27ef84e9a0d5f6b78a022996ae49f4a (diff)
downloadswift-950dfa7923f62297429e49a135e4fb363447366d.zip
swift-950dfa7923f62297429e49a135e4fb363447366d.tar.bz2
Split linkflags on spaces.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot7
1 files changed, 6 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index dc8a8a5..f7956b5 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -117,7 +117,12 @@ else :
if "link" in env :
env["SHLINK"] = env["link"]
env["LINK"] = env["link"]
-env["LINKFLAGS"] = env.get("linkflags", [])
+linkflags = env.get("linkflags", [])
+if isinstance(linkflags, str) :
+ # FIXME: Make the splitting more robust
+ env["LINKFLAGS"] = linkflags.split(" ")
+else :
+ env["LINKFLAGS"] = linkflags
# This isn't a real flag (yet) AFAIK. Be sure to append it to the CXXFLAGS
# where you need it
env["OBJCCFLAGS"] = []