summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-16 18:21:45 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-16 18:21:45 (GMT)
commit4d182bfb1621687a818f0a80fc77a392f381c5da (patch)
tree73db7e9349e4edc786d4974209136fa0ec6e98cb /Swiften/QA/NetworkTest/SConscript
parentdfb2231c337a00e10e93e6cd61fd004db772c51d (diff)
downloadswift-4d182bfb1621687a818f0a80fc77a392f381c5da.zip
swift-4d182bfb1621687a818f0a80fc77a392f381c5da.tar.bz2
Fix inconsistent build flags with test=X.
Diffstat (limited to 'Swiften/QA/NetworkTest/SConscript')
-rw-r--r--Swiften/QA/NetworkTest/SConscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
index cf66a68..871df39 100644
--- a/Swiften/QA/NetworkTest/SConscript
+++ b/Swiften/QA/NetworkTest/SConscript
@@ -4,11 +4,11 @@ Import("env")
if env["TEST"] :
myenv = env.Clone()
- myenv.MergeFlags(env["CHECKER_FLAGS"])
- myenv.MergeFlags(env["SWIFTEN_FLAGS"])
- myenv.MergeFlags(env["CPPUNIT_FLAGS"])
- myenv.MergeFlags(env["BOOST_FLAGS"])
- myenv.MergeFlags(env["LIBIDN_FLAGS"])
+ myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+ myenv.MergeFlags(myenv["BOOST_FLAGS"])
+ myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
tester = myenv.Program("NetworkTest", [
"BoostConnectionServerTest.cpp",