minor fixes for clang++

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index be18565..8566c0f 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -101,22 +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', '--param', 'inline-unit-growth=60' ],
-    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', 
-                               "${profile and '-pg' or None}" ],
-    CXXFLAGS_final         = [ '-O3', '-fno-threadsafe-statics' ],
+                               "${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', 'BOOST_DISABLE_THREADS' ],
+    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_', "${profile and '-pg' or None}" ],
-    LINKFLAGS_final        = [ ],
+    LINKFLAGS_final        = [ "${profile and ' ' or '-Wl,--gc-sections'}" ],
     LINKFLAGS_normal       = [ '-Wl,-S' ],
     LINKFLAGS_debug        = [ '-g' ],
 )
@@ -181,7 +185,7 @@ SConscript('SConfigure')
 
 env.Append(LIBS = [ '$LIBSENF$LIBADDSUFFIX',
                     '$BOOSTREGEXLIB', '$BOOSTSIGNALSLIB',
-                    '$BOOSTFSLIB', '$BOOSTSYSTEMLIB' ])
+                    '$BOOSTFSLIB', '$BOOSTSYSTEMLIB', '$BOOSTDATETIMELIB' ])
 
 ###########################################################################