X-Git-Url: http://g0dil.de/git?p=senf.git;a=blobdiff_plain;f=SConstruct;h=8566c0f91fb9cfb50203a2feb6dbce2ab9937db8;hp=08056ad2fd4b95da1f307a7cc7c4238faf7078b0;hb=HEAD;hpb=8558757024b5e0181b62f888f665dc2dfc48639b

diff --git a/SConstruct b/SConstruct
index 08056ad..8566c0f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -101,21 +101,26 @@ env.Append(
                                '--param','large-function-growth=10000',
                                '--param', 'large-function-insns=10000',
                                '--param','inline-unit-growth=10000' ],
-    INLINE_OPTS_NORMAL     = [ '-finline-limit=5000' ],
-    INLINE_OPTS            = [ '$INLINE_OPTS_NORMAL' ],
+    INLINE_OPTS_GCC        = [ '-finline-limit=5000', '--param', 'inline-unit-growth=60' ],
+    INLINE_OPTS            = [ '${str(CXX).split("/")[-1] == "g++" and "$INLINE_OPTS_GCC" or None}' ],
+    CXXFLAGS_CLANG         = [ '-Wno-unneeded-internal-declaration' ], # needed for BOOST_PARAMETER_KEYWORD
     CXXFLAGS               = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long', '$INLINE_OPTS',
-                               '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing' ],
-    CXXFLAGS_final         = [ '-O3' ],
+                               '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing', 
+                               "${profile and '-pg' or None}",
+                               '${str(CXX).split("/")[-1] == "clang++" and "$CXXFLAGS_CLANG" or None}' ],
+    CXXFLAGS_final         = [ '-O3', '-fno-threadsafe-statics','-fno-stack-protector',
+                               "${profile and ' ' or '-ffunction-sections'}" ],
     CXXFLAGS_normal        = [ '-O2', '-g' ],
     CXXFLAGS_debug         = [ '-O0', '-g' ],
 
     CPPDEFINES             = [ '$expandLogOption', '$CPPDEFINES_' ],
-    CPPDEFINES_final       = [ 'SENF_PPI_NOTRACE', 'BOOST_NO_MT', 'NDEBUG', 'BOOST_DISABLE_ASSERTS' ],
+    CPPDEFINES_final       = [ 'SENF_PPI_NOTRACE', 'NDEBUG', 
+                               'BOOST_NO_MT', 'BOOST_DISABLE_ASSERTS', 'BOOST_DISABLE_THREADS' ],
     CPPDEFINES_normal      = [ 'SENF_DEBUG' ],
     CPPDEFINES_debug       = [ '$CPPDEFINES_normal' ],
 
-    LINKFLAGS              = [ '-rdynamic', '$LINKFLAGS_' ],
-    LINKFLAGS_final        = [ ],
+    LINKFLAGS              = [ '-rdynamic', '$LINKFLAGS_', "${profile and '-pg' or None}" ],
+    LINKFLAGS_final        = [ "${profile and ' ' or '-Wl,--gc-sections'}" ],
     LINKFLAGS_normal       = [ '-Wl,-S' ],
     LINKFLAGS_debug        = [ '-g' ],
 )
@@ -138,13 +143,15 @@ env.SetDefault(
     VALGRIND               = "valgrind",
     SCONSBIN               = env.File("#/tools/scons"),
     SCONSARGS              = ([ '-Q', '-j$CONCURRENCY_LEVEL' ] +
-                              [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ]),
+                              [ '%s=%s' % (k,v) for k,v in ARGLIST ]),
     SCONS                  = "@$SCONSBIN $SCONSARGS",
     CONCURRENCY_LEVEL      = env.GetOption('num_jobs') or 1,
     TOPDIR                 = env.Dir('#').abspath,
     LIBADDSUFFIX           = '${FLAVOR and "_$FLAVOR" or ""}',
     OBJADDSUFFIX           = '${LIBADDSUFFIX}',
     FLAVOR                 = '',
+
+    PARSEFLAGS             = '',
 )
 
 # Set variables from command line
@@ -152,6 +159,7 @@ senfutil.parseArguments(
     env,
     BoolVariable('final', 'Build final (optimized) build', False),
     BoolVariable('debug', 'Link in debug symbols', False),
+    BoolVariable('profile', 'compile and link with the profiling enabled option', False),
     BoolVariable('syslayout', 'Install in to system layout directories (lib/, include/ etc)', False),
     BoolVariable('sparse_tests', 'Link tests against object files and not the senf lib', False)
 )
@@ -175,9 +183,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', '$BOOSTDATETIMELIB' ])
 
 ###########################################################################
 
@@ -216,7 +224,6 @@ if env['sparse_tests']:
 #### install_all, default, all_tests, all
 env.Install('${SCONSINSTALLDIR}', [ 'site_scons/__init__.py',
                                     'site_scons/senfutil.py',
-                                    'site_scons/senfconf.py',
                                     'site_scons/yaptu.py' ])
 env.InstallDir('${SCONSINSTALLDIR}', [ 'site_scons/site_tools', 'site_scons/lib' ],
                FILTER_SUFFIXES=[ '','.css','.pl','.py','.sh','.sty','.xml','.xsl','.yap' ])
@@ -229,7 +236,7 @@ env.Alias('all_tests', env.FindAllBoostUnitTests())
 env.Alias('test_changes', 'all_tests')
 env.Alias('all', [ 'default', 'all_tests', 'examples', 'all_docs' ])
 
-#### prepare
+#### prepare and -c some
 env.PhonyTarget('prepare', [], [])
 env.PhonyTarget('some', [], [])
 
@@ -305,6 +312,6 @@ for target in COMMAND_LINE_TARGETS:
 env.PhonyTarget('clean', [], [
         lambda **args: sys.stderr.write(
             "=================================================================\n"
-            "'clean' is not a valid target. Instead, use\n"
+            "'clean' is not a valid target, use the '-c' option instead:\n"
             "    $ scons -c all\n"
             "=================================================================\n") ])