summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-11-13 12:02:07 (GMT)
committerSwift Review <review@swift.im>2014-11-17 09:10:30 (GMT)
commit2768a75491cad2f136de0df170508a5c7e21d5c3 (patch)
tree20b7ea6c39ec881f4b5f15c3d69a4fde05b9bd9d /3rdParty/Expat
parent89ca71d4016415b0f5403b8e76bbbce2012dca13 (diff)
downloadswift-2768a75491cad2f136de0df170508a5c7e21d5c3.zip
swift-2768a75491cad2f136de0df170508a5c7e21d5c3.tar.bz2
Pass Boost include/linker flags along when building bundled Expat.
Test-Information: Tested under OS X with external boost and forced bundled Expat. Change-Id: I846b52e6c40e35523553a404af991aee6ef6e9cc
Diffstat (limited to '3rdParty/Expat')
-rw-r--r--3rdParty/Expat/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index e8c1e25..c961483 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -15,6 +15,7 @@ if env.get("EXPAT_BUNDLED", False) :
myenv.Append(CPPPATH = [".", "src", "../Boost/src"])
else :
myenv.Append(CPPPATH = [".", "src"])
+ myenv.MergeFlags(env["BOOST_FLAGS"])
conf = Configure(conf_env)
if conf.CheckFunc('memmove') :