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/SConscript
parentdfb2231c337a00e10e93e6cd61fd004db772c51d (diff)
downloadswift-contrib-4d182bfb1621687a818f0a80fc77a392f381c5da.zip
swift-contrib-4d182bfb1621687a818f0a80fc77a392f381c5da.tar.bz2
Fix inconsistent build flags with test=X.
Diffstat (limited to 'Swiften/SConscript')
-rw-r--r--Swiften/SConscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index d896cd8..6ebc865 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -6,13 +6,13 @@ env["SWIFTEN_FLAGS"] = {
}
swiften_env = env.Clone()
-swiften_env.MergeFlags(env["BOOST_FLAGS"])
+swiften_env.MergeFlags(swiften_env["BOOST_FLAGS"])
Export("swiften_env")
# TODO: Move all this to a submodule SConscript
myenv = swiften_env.Clone()
-myenv.MergeFlags(env["ZLIB_FLAGS"])
-myenv.MergeFlags(env["OPENSSL_FLAGS"])
+myenv.MergeFlags(myenv["ZLIB_FLAGS"])
+myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
sources = [
"Avatars/AvatarFileStorage.cpp",
"Avatars/AvatarManager.cpp",