Fix some small and innocent build-system bugs

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 0bb858a..ec88386 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -104,7 +104,7 @@ env.Append(
    CPPDEFINES             = [ '$expandLogOption', '$CPPDEFINES_' ],
    expandLogOption        = senfutil.expandLogOption,
    CPPDEFINES_            = senfutil.BuildTypeOptions('CPPDEFINES'),
-   CPPDEFINES_final       = [ 'SENF_PPI_NOTRACE'],
+   CPPDEFINES_final       = [ 'SENF_PPI_NOTRACE', 'BOOST_NO_MT' ],
    CPPDEFINES_normal      = [ 'SENF_DEBUG' ],
    CPPDEFINES_debug       = [ '$CPPDEFINES_normal' ],
 
@@ -121,8 +121,8 @@ env.SetDefault(
     GENHTML           = "genhtml",
     VALGRIND          = "valgrind",
     SCONSBIN          = env.File("#/tools/scons"),
-    SCONSARGS         = [ '-Q', '-j$CONCURRENCY_LEVEL', 'debug=$debug', 'final=$final' ] + \
-        [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ],
+    SCONSARGS         = ([ '-Q', '-j$CONCURRENCY_LEVEL' ] + 
+                         [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ]),
     SCONS             = "@$SCONSBIN $SCONSARGS",
     CONCURRENCY_LEVEL = env.GetOption('num_jobs') or 1,
     TOPDIR            = env.Dir('#').abspath,