SenfScons: revoked fix for parseArguments() in senfutil :-/

[senf.git] / site_scons / senfutil.py

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 8fa8759..b86c14e 100644 (file)
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -54,12 +54,12 @@ Special command line parameters:
     for k,v in ARGLIST:
         if not unknv.has_key(k) : continue
         if k.endswith('+'):
-            env.Append(**{k[:-1]: [v]})
-            env.Append(ARGUMENT_VARIABLES = {k[:-1]:[v]})
+            env.Append(**{k[:-1]: v})
+            env.Append(ARGUMENT_VARIABLES = {k[:-1]:v})
         else:
             env.Replace(**{k: v})
             env.Append(ARGUMENT_VARIABLES = {k:v})
-    if env['PARSEFLAGS']:
+    if env.get('PARSEFLAGS', None):
         env.MergeFlags(env['PARSEFLAGS'])
 
 def importProcessEnv(env):
@@ -168,7 +168,7 @@ def SetupForSENF(env, senf_path = [], flavor=None):
         CPPDEFINES        = [ '$expandLogOption' ],
         CXXFLAGS          = [ '-Wno-long-long', '-fno-strict-aliasing' ],
         LINKFLAGS         = [ '-rdynamic' ],
-        LIBS              = [ 'senf$LIBADDSUFFIX', 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB',
+        LIBS              = [ 'senf$LIBADDSUFFIX', 'rt', '$BOOSTREGEXLIB',
                               '$BOOSTSIGNALSLIB', '$BOOSTFSLIB' ],
         )