summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 11:11:39 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 11:11:39 (GMT)
commit2d8b89074c21627bd2c9c94357ca158868937da2 (patch)
treed8ca769762f0e25ac6c080ce9f76de838d65112c /QA/UnitTest/SConscript
parent7af8a078c57d94ff63eb81f26de2f55eca6b5c00 (diff)
downloadswift-2d8b89074c21627bd2c9c94357ca158868937da2.zip
swift-2d8b89074c21627bd2c9c94357ca158868937da2.tar.bz2
Use UseFlags for compiling the unit test.
Diffstat (limited to 'QA/UnitTest/SConscript')
-rw-r--r--QA/UnitTest/SConscript30
1 files changed, 15 insertions, 15 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 76abbcb..8cc43b9 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -8,21 +8,21 @@ if env["TEST"] :
env["UNITTEST_OBJECTS"] = []
if env["SCONS_STAGE"] == "test" :
myenv = env.Clone()
- myenv.MergeFlags(env.get("CHECKER_FLAGS",""))
- myenv.MergeFlags(env.get("SLIMBER_FLAGS",""))
- myenv.MergeFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
- myenv.MergeFlags(env.get("SWIFTOOLS_FLAGS",""))
- myenv.MergeFlags(env.get("LIMBER_FLAGS",""))
- myenv.MergeFlags(env.get("SWIFTEN_FLAGS",""))
- myenv.MergeFlags(env.get("CPPUNIT_FLAGS",""))
- myenv.MergeFlags(env.get("LIBIDN_FLAGS", ""))
- myenv.MergeFlags(env.get("BOOST_FLAGS", ""))
- myenv.MergeFlags(env.get("SQLITE_FLAGS", ""))
- myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
- myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
- myenv.MergeFlags(env.get("ZLIB_FLAGS", ""))
- myenv.MergeFlags(env.get("OPENSSL_FLAGS", ""))
- myenv.MergeFlags(env["PLATFORM_FLAGS"])
+ myenv.UseFlags(env.get("CHECKER_FLAGS",""))
+ myenv.UseFlags(env.get("SLIMBER_FLAGS",""))
+ myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
+ myenv.UseFlags(env.get("SWIFTOOLS_FLAGS",""))
+ myenv.UseFlags(env.get("LIMBER_FLAGS",""))
+ myenv.UseFlags(env.get("SWIFTEN_FLAGS",""))
+ myenv.UseFlags(env.get("CPPUNIT_FLAGS",""))
+ myenv.UseFlags(env.get("LIBIDN_FLAGS", ""))
+ myenv.UseFlags(env.get("BOOST_FLAGS", ""))
+ myenv.UseFlags(env.get("SQLITE_FLAGS", ""))
+ myenv.UseFlags(env.get("LIBXML_FLAGS", ""))
+ myenv.UseFlags(env.get("EXPAT_FLAGS", ""))
+ myenv.UseFlags(env.get("ZLIB_FLAGS", ""))
+ myenv.UseFlags(env.get("OPENSSL_FLAGS", ""))
+ myenv.UseFlags(env["PLATFORM_FLAGS"])
if env.get("HAVE_LIBXML") :
myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
if env.get("HAVE_EXPAT") :