summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-07-17 18:50:44 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-07-17 18:50:44 (GMT)
commit4a251b6acf7d70cd63dbd9983a8585368027520a (patch)
treec03659fcfb07cf8508272650718ef691e4db4921 /SwifTools
parent93f21561e220733f1b0f32cdd4bf30ecdb70eb0e (diff)
downloadswift-4a251b6acf7d70cd63dbd9983a8585368027520a.zip
swift-4a251b6acf7d70cd63dbd9983a8585368027520a.tar.bz2
Make sure flags are consistent across different modules.
Diffstat (limited to 'SwifTools')
-rw-r--r--SwifTools/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index e5085cc..5b97bed 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -16,6 +16,7 @@ if env["SCONS_STAGE"] == "flags" :
if env["SCONS_STAGE"] == "build" :
swiftools_env = env.Clone()
+ swiftools_env.MergeFlags(swiftools_env["SWIFTEN_FLAGS"])
swiftools_env.MergeFlags(swiftools_env["BOOST_FLAGS"])
sources = [