summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-11 17:07:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-11 17:07:26 (GMT)
commitc1dd2a64376ee4e7828ca4cb34c3a9a38034073e (patch)
treed06b3cdad5eb11205661e03d0b60da89ec7cc392 /3rdParty/Expat/SConscript
parentd721b7a3d6314731c120cf77722572cb28570992 (diff)
downloadswift-contrib-c1dd2a64376ee4e7828ca4cb34c3a9a38034073e.zip
swift-contrib-c1dd2a64376ee4e7828ca4cb34c3a9a38034073e.tar.bz2
Make OpenSSL required for Swift.
Diffstat (limited to '3rdParty/Expat/SConscript')
-rw-r--r--3rdParty/Expat/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index cf7b684..8220f01 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -1,4 +1,4 @@
-Import("env")
+Import(["env", "conf_env")
env["EXPAT_FLAGS"] = {
"CPPDEFINES": ["XML_STATIC"],
@@ -11,7 +11,7 @@ myenv = env.Clone()
myenv.Append(CPPDEFINES = ["XML_STATIC", "HAVE_EXPAT_CONFIG_H"])
myenv.Append(CPPPATH = [".", "src"])
-conf = Configure(myenv)
+conf = Configure(conf_env)
if conf.CheckFunc('memmove') :
myenv.Append(CPPDEFINES = ["HAVE_MEMMOVE"])
conf.Finish()