Merge branch 'master' into spirit-x3

This commit is contained in:
artemp 2015-12-02 11:11:28 +00:00
commit 6acd0b05ab

View file

@ -1787,6 +1787,9 @@ if not preconfigured:
# TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion viable
common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
if 'clang++' in env['CXX']:
common_cxx_flags += ' -Wno-unsequenced '
if env['DEBUG']:
env.Append(CXXFLAGS = common_cxx_flags + '-O0')
else: