From 94301d22ba84fdf5427b1777038d80015d8c0c16 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 13 Mar 2014 02:19:12 +0000 Subject: [PATCH] [Scons] Use compiler-independent method for handling NDEBUG --- SConstruct | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 9ceea20e4..1e64f2734 100644 --- a/SConstruct +++ b/SConstruct @@ -208,7 +208,7 @@ defaults.warningFlags = '' if 'gcc' in env.subst('$CC'): defaults.debugCcFlags = '-g' defaults.noOptimizeCcFlags = '-O0' - defaults.optimizeCcFlags = '-O3 -DNDEBUG -Wno-inline' + defaults.optimizeCcFlags = '-O3 -Wno-inline' defaults.warningFlags = '-Wall' elif env['CC'] == 'cl': # Visual Studio @@ -220,7 +220,7 @@ elif env['CC'] == 'cl': # Visual Studio defaults.cxxFlags.append('/D_VARIADIC_MAX=10') defaults.debugCcFlags = '/Zi /Fd${TARGET}.pdb' defaults.noOptimizeCcFlags = '/Od /Ob0' - defaults.optimizeCcFlags = '/O2 /DNDEBUG' + defaults.optimizeCcFlags = '/O2' defaults.debugLinkFlags = '/DEBUG' defaults.warningFlags = '/W3' @@ -228,14 +228,14 @@ elif 'icc' in env.subst('$CC'): defaults.ccFlags = '-vec-report0 -diag-disable 1478' defaults.debugCcFlags = '-g' defaults.noOptimizeCcFlags = '-O0' - defaults.optimizeCcFlags = '-O3 -DNDEBUG' + defaults.optimizeCcFlags = '-O3' defaults.warningFlags = '-Wcheck' elif 'clang' in env.subst('$CC'): defaults.ccFlags = '-fcolor-diagnostics' defaults.debugCcFlags = '-g' defaults.noOptimizeCcFlags = '-O0' - defaults.optimizeCcFlags = '-O3 -DNDEBUG' + defaults.optimizeCcFlags = '-O3' defaults.warningFlags = '-Wall' else: @@ -710,11 +710,13 @@ conf = Configure(env) env['CXXFLAGS'] = listify(env['cxx_flags']) env['CCFLAGS'] = listify(env['cc_flags']) + listify(env['thread_flags']) env['LINKFLAGS'] += listify(env['thread_flags']) +env['CPPDEFINES'] = {} env['warning_flags'] = listify(env['warning_flags']) if env['optimize']: env['CCFLAGS'] += listify(env['optimize_flags']) + env.Append(CPPDEFINES=['NDEBUG']) else: env['CCFLAGS'] += listify(env['no_optimize_flags'])