X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=8f4da1c292929685284bd4f3c9e1f75d90fa5801;hb=1f270d560ae6f4b70bbca1e671c29aaf55bc8922;hp=ebef9b973cbcf2a6531fa90411437e26a08aab0a;hpb=8db732cfb7203fbad3ffc6bddc43346af7411b46;p=senf.git

diff --git a/SConstruct b/SConstruct
index ebef9b9..8f4da1c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -104,7 +104,8 @@ env.Append(
     INLINE_OPTS_NORMAL     = [ '-finline-limit=5000', '--param', 'inline-unit-growth=60' ],
     INLINE_OPTS            = [ '$INLINE_OPTS_NORMAL' ],
     CXXFLAGS               = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long', '$INLINE_OPTS',
-                               '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing' ],
+                               '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing', 
+                               "${profile and '-pg' or None}" ],
     CXXFLAGS_final         = [ '-O3' ],
     CXXFLAGS_normal        = [ '-O2', '-g' ],
     CXXFLAGS_debug         = [ '-O0', '-g' ],
@@ -114,7 +115,7 @@ env.Append(
     CPPDEFINES_normal      = [ 'SENF_DEBUG' ],
     CPPDEFINES_debug       = [ '$CPPDEFINES_normal' ],
 
-    LINKFLAGS              = [ '-rdynamic', '$LINKFLAGS_' ],
+    LINKFLAGS              = [ '-rdynamic', '$LINKFLAGS_', "${profile and '-pg' or None}" ],
     LINKFLAGS_final        = [ ],
     LINKFLAGS_normal       = [ '-Wl,-S' ],
     LINKFLAGS_debug        = [ '-g' ],
@@ -145,6 +146,8 @@ env.SetDefault(
     LIBADDSUFFIX           = '${FLAVOR and "_$FLAVOR" or ""}',
     OBJADDSUFFIX           = '${LIBADDSUFFIX}',
     FLAVOR                 = '',
+
+    PARSEFLAGS             = '',
 )
 
 # Set variables from command line
@@ -157,13 +160,8 @@ senfutil.parseArguments(
     BoolVariable('sparse_tests', 'Link tests against object files and not the senf lib', False)
 )
 
-# gprof
-if env['profile']:
-    env.Append(
-        LINKFLAGS          = [ '-pg' ],
-        CXXFLAGS           = [ '-pg' ],
-    )
-
+if env['PARSEFLAGS']:
+    env.MergeFlags(env['PARSEFLAGS'])
 
 # Add UNIX env vars matching IMPORT_ENV patterns into the execution environment
 senfutil.importProcessEnv(env)