revert r2496

This commit is contained in:
Dane Springmeyer 2011-01-05 18:15:19 +00:00
parent 367f2b3089
commit 52eb8d3619

View file

@ -1170,9 +1170,7 @@ if not preconfigured:
env.Append(CXXFLAGS = common_cxx_flags + '-O %s' % ndebug_flags) env.Append(CXXFLAGS = common_cxx_flags + '-O %s' % ndebug_flags)
else: else:
# Common flags for GCC. # Common flags for GCC.
# note: starting with boost 1.46 boost filesystem v3 is default so force to be v2 gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-200 %s' % (pthread, common_cxx_flags)
# by using BOOST_FILESYSTEM_VERSION=2 (until we upgrade)
gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-200 -DBOOST_FILESYSTEM_VERSION=2 %s' % (pthread, common_cxx_flags)
if env['DEBUG']: if env['DEBUG']:
env.Append(CXXFLAGS = gcc_cxx_flags + '-O0 -fno-inline %s' % debug_flags) env.Append(CXXFLAGS = gcc_cxx_flags + '-O0 -fno-inline %s' % debug_flags)