summaryrefslogtreecommitdiffstats
path: root/QA
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-08-08 17:47:43 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-08-08 17:47:43 (GMT)
commit8e11206adcdff6f7781b4f12bac6eeb8c3cba65a (patch)
tree48578e265e5ab01d5614a89184f7f877a27586a5 /QA
parent173ad94b6edfafa614700e7ccb66f7d30ef98a10 (diff)
downloadswift-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.zip
swift-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.tar.bz2
More build fixes.
Diffstat (limited to 'QA')
-rw-r--r--QA/Checker/SConscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript
index 1d0d255..d180af2 100644
--- a/QA/Checker/SConscript
+++ b/QA/Checker/SConscript
@@ -11,7 +11,7 @@ if env["TEST"] :
if env["SCONS_STAGE"] == "build" :
checker_env = env.Clone()
- checker_env.MergeFlags(env["SWIFTEN_FLAGS"])
- checker_env.MergeFlags(env["BOOST_FLAGS"])
- checker_env.MergeFlags(env["CPPUNIT_FLAGS"])
+ checker_env.UseFlags(env["SWIFTEN_FLAGS"])
+ checker_env.UseFlags(env["BOOST_FLAGS"])
+ checker_env.UseFlags(env["CPPUNIT_FLAGS"])
checker_env.Library("Checker", ["checker.cpp", "IO.cpp"])