summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-08-25 16:39:06 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-08-27 19:47:48 (GMT)
commit1bb607f96e79845ce30dd5590b0d53cc394ac150 (patch)
tree6156622ddd1b3238aec73536e0dc25b632965a71 /3rdParty
parentc4431ee90f3f1daac0a12b35bfa3378d5c570eaa (diff)
downloadswift-1bb607f96e79845ce30dd5590b0d53cc394ac150.zip
swift-1bb607f96e79845ce30dd5590b0d53cc394ac150.tar.bz2
PubSub implementation & Sluift refactoring.
Change-Id: I04ff7111b73565c00bff6db183451774a633344f
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/Boost/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index ba5aa47..adb6d4e 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -159,7 +159,7 @@ elif env.get("BOOST_BUNDLED", False) :
myenv.MergeFlags(myenv["BOOST_FLAGS"])
myenv.StaticLibrary("Swiften_Boost", sources)
- if ARGUMENTS.get("BOOST_BUILD_BCP") or env.GetOption("clean") :
+ if ARGUMENTS.get("BOOST_BUILD_BCP") or env.get("BOOST_BUILD_BCP", False) or env.GetOption("clean") :
bcp_env = myenv.Clone()
bcp_env.MergeFlags(bcp_env["BOOST_FLAGS"])
bcp_env.Append(CPPPATH = ["src/tools/bcp"])