X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=d31c844aaad47d6558cb77c7c0c2e7574938b8cc;hb=5209d7573f53f4b32730833af00668f5c0e56147;hp=125984afa0d424a12a0c278586aba9dd33e724e2;hpb=35dc9a1d15908130991a87d5614ed1f81671d9b4;p=senf.git diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py index 125984a..d31c844 100644 --- a/senfscons/SENFSCons.py +++ b/senfscons/SENFSCons.py @@ -153,6 +153,7 @@ def FinalizeBoost(env): env['BOOSTTESTLIB'] = 'boost_unit_test_framework' + env['BOOST_VARIANT'] env['BOOSTREGEXLIB'] = 'boost_regex' + env['BOOST_VARIANT'] env['BOOSTFSLIB'] = 'boost_filesystem' + env['BOOST_VARIANT'] + env['BOOSTIOSTREAMSLIB'] = 'boost_iostreams' + env['BOOST_VARIANT'] env.Append(LIBPATH = [ '$BOOST_LIBDIR' ], CPPPATH = [ '$BOOST_INCLUDES' ]) @@ -246,13 +247,13 @@ def MakeEnvironment(): LIBPATH = [ '$LOCALLIBDIR' ]) if env['final']: - env.Append(CXXFLAGS = [ '-O3' ], - CPPDEFINES = [ 'SENF_NO_DEBUG' ]) + env.Append(CXXFLAGS = [ '-O3' ]) else: + # The boost-regex library is not compiled with _GLIBCXX_DEBUG so this fails: + # CPPDEFINES = [ '_GLIBCXX_DEBUG' ], env.Append(CXXFLAGS = [ '-O0', '-g', '-fno-inline' ], - # The boost-regex library is not compiled with _GLIBCXX_DEBUG so this fails. - # CPPDEFINES = [ '_GLIBCXX_DEBUG' ], - LINKFLAGS = [ '-g' ]) + CPPDEFINES = [ 'SENF_DEBUG' ], + LINKFLAGS = [ '-g', '-rdynamic' ]) env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ], LIBS = [ '$EXTRA_LIBS' ],