summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-10 20:55:31 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-10 20:57:13 (GMT)
commit5b45133a6cc563ea32daa3cafa48b173fc1e61ab (patch)
tree718a61e076999a098ef400b54f484a9da8f62a78 /SConstruct
parent44d66c87401b38b2be0ca7875d9c72c222cd268f (diff)
downloadswift-5b45133a6cc563ea32daa3cafa48b173fc1e61ab.zip
swift-5b45133a6cc563ea32daa3cafa48b173fc1e61ab.tar.bz2
Fix SCons building on os x again.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct11
1 files changed, 7 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 87a2f4c..6e52bc5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -32,7 +32,7 @@ if int(ARGUMENTS.get("universal", 0)) == 1 :
"-arch", "ppc"])
if int(ARGUMENTS.get("warnings", env["PLATFORM"] != "win32")) == 1 :
- if env["PLATFORM"] != "win32" :
+ if env["PLATFORM"] == "win32" :
env.Append(CCFLAGS = ["/Wall"])
else :
env.Append(CCFLAGS = ["-W", "-Wall"])
@@ -121,15 +121,18 @@ else :
SConscript("3rdParty/ZLib/SConscript")
if conf.CheckLib("dl") :
- env.Append(LIBS = "dl")
+ env.Append(LIBS = ["dl"])
+
+if conf.CheckLib("c") :
+ env.Append(LIBS = ["c"])
if conf.CheckLib("resolv") :
- env.Append(LIBS = "resolv")
+ env.Append(LIBS = ["resolv"])
if conf.CheckCHeader("expat.h") and conf.CheckLib("expat") :
env["HAVE_EXPAT"] = 1
env["EXPAT_FLAGS"] = ""
- env.Append(LIBS = "expat")
+ env.Append(LIBS = ["expat"])
conf.Finish()