summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-08-16 19:22:28 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-08-16 19:22:28 (GMT)
commitfb21158d7d64fd49e1fa0344db5576c1eff38126 (patch)
treefa354ded9206a9212742d8e38301133732512689 /BuildTools/SCons
parent194ffe005d77ac1b83df050f99dea99af78f175c (diff)
downloadswift-contrib-fb21158d7d64fd49e1fa0344db5576c1eff38126.zip
swift-contrib-fb21158d7d64fd49e1fa0344db5576c1eff38126.tar.bz2
Fix LibXML check.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 6b5a9de..ac28ec9 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -365,7 +365,7 @@ if not env.get("HAVE_EXPAT", False) :
# Bundled expat
bundledExpat = False
-if not env.get("HAVE_EXPAT", 0) :
+if not env.get("HAVE_EXPAT", 0) and not env.get("HAVE_LIBXML", 0) :
print "Expat or LibXML not found. Using bundled Expat"
SConscript("#/3rdParty/Expat/SConscript")
env["HAVE_EXPAT"] = 1