summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-21 09:28:39 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-21 09:28:39 (GMT)
commit3bcabdb3c42ae66b615dfe611ec117695709dd8c (patch)
tree4a7bd519b7f1e34bcd6e46605bebd6a365e679aa
parentb9789d12ea23058e24db495340a3fdaead3cd73b (diff)
downloadswift-3bcabdb3c42ae66b615dfe611ec117695709dd8c.zip
swift-3bcabdb3c42ae66b615dfe611ec117695709dd8c.tar.bz2
ldflags -> linkflags
-rw-r--r--SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 728e3c5..1559e0a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4,13 +4,13 @@ sys.path.append(Dir("BuildTools/SCons").abspath)
################################################################################
# Build variables
################################################################################
vars = Variables("config.py")
vars.Add('ccflags', "Extra C(++) compiler flags")
-vars.Add('ldflags', "Extra linker flags")
+vars.Add('linkflags', "Extra linker flags")
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" if os.name != "nt" else "no"))
vars.Add(BoolVariable("warnings", "Compile with warnings turned on",
"yes" if os.name != "nt" else "no"))
if os.name != "nt" :
@@ -45,13 +45,13 @@ if env["PLATFORM"] == "darwin" :
env.Tool("AppBundle", toolpath = ["#/BuildTools/SCons/Tools"])
if env["PLATFORM"] == "win32" :
env.Tool("WindowsBundle", toolpath = ["#/BuildTools/SCons/Tools"])
# Default compiler flags
env["CCFLAGS"] = env.get("ccflags", [])
-env["LDFLAGS"] = env.get("ldflags", [])
+env["LINKFLAGS"] = env.get("linkflags", [])
if env["optimize"] :
env.Append(CCFLAGS = "-O2")
if env["PLATFORM"] == "win32" :
env.Append(CCFLAGS = ["GL"])
env.Append(LINKFLAGS = ["/INCREMENTAL:NO", "/LTCG"])