PPI: fixed module destruction on shutdown if EventManger is already destroyed (like...

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 8f4da1c..03965b5 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -160,9 +160,6 @@ senfutil.parseArguments(
     BoolVariable('sparse_tests', 'Link tests against object files and not the senf lib', False)
 )
 
-if env['PARSEFLAGS']:
-    env.MergeFlags(env['PARSEFLAGS'])
-
 # Add UNIX env vars matching IMPORT_ENV patterns into the execution environment
 senfutil.importProcessEnv(env)
 
@@ -182,9 +179,9 @@ SConscript('SConfigure')
 
 # Only add this here, after all configure checks have run
 
-env.Append(LIBS = '$LIBSENF$LIBADDSUFFIX',
-           EXTRA_LIBS = [ '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
-                          '$BOOSTFSLIB' ])
+env.Append(LIBS = [ '$LIBSENF$LIBADDSUFFIX',
+                    '$BOOSTREGEXLIB', '$BOOSTSIGNALSLIB',
+                    '$BOOSTFSLIB', '$BOOSTSYSTEMLIB' ])
 
 ###########################################################################