Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-08-08 17:47:43 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-08-08 17:47:43 (GMT) |
| commit | 8e11206adcdff6f7781b4f12bac6eeb8c3cba65a (patch) | |
| tree | 48578e265e5ab01d5614a89184f7f877a27586a5 /Limber | |
| parent | 173ad94b6edfafa614700e7ccb66f7d30ef98a10 (diff) | |
| download | swift-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.zip swift-8e11206adcdff6f7781b4f12bac6eeb8c3cba65a.tar.bz2 | |
More build fixes.
Diffstat (limited to 'Limber')
| -rw-r--r-- | Limber/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Limber/SConscript b/Limber/SConscript index d49fc94..13bc0df 100644 --- a/Limber/SConscript +++ b/Limber/SConscript @@ -8,8 +8,8 @@ if env["SCONS_STAGE"] == "flags" : elif env["SCONS_STAGE"] == "build" : libenv = env.Clone() - libenv.MergeFlags(env["BOOST_FLAGS"]) - libenv.MergeFlags(env["SWIFTEN_FLAGS"]) + libenv.UseFlags(env["SWIFTEN_FLAGS"]) + libenv.UseFlags(env["SWIFTEN_DEP_FLAGS"]) libenv.StaticLibrary("Limber", [ "Server/ServerFromClientSession.cpp", "Server/ServerSession.cpp", |