X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsenfutil.py;h=b86c14ef8e9d30af7c77c7f3cc151aebb308c5ff;hb=1081c75b5564fda3eef4918bf137a76fe62fe9ae;hp=8fa8759711a059387a214a837af2fa929d867db3;hpb=f792c278aba0cc2080591d393fff2d8cdca9b95d;p=senf.git diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py index 8fa8759..b86c14e 100644 --- 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' ], )