From 0ba2294af0d2e3daf3c6eeef26ab29e47973a2ca Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 13 Mar 2014 02:19:08 +0000 Subject: [PATCH] [SCons] Remove unnecessary compiler flags These flags all correspond to default compiler behavior --- SConstruct | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 571d3db82..9ceea20e4 100644 --- a/SConstruct +++ b/SConstruct @@ -206,15 +206,14 @@ defaults.noDebugLinkFlags = '' defaults.warningFlags = '' if 'gcc' in env.subst('$CC'): - defaults.cxxFlags = '-ftemplate-depth-128' defaults.debugCcFlags = '-g' - defaults.noOptimizeCcFlags = '-O0 -fno-inline' - defaults.optimizeCcFlags = '-O3 -DNDEBUG -finline-functions -Wno-inline' + defaults.noOptimizeCcFlags = '-O0' + defaults.optimizeCcFlags = '-O3 -DNDEBUG -Wno-inline' defaults.warningFlags = '-Wall' elif env['CC'] == 'cl': # Visual Studio defaults.cxxFlags = ['/EHsc'] - defaults.ccFlags = ['/MD', '/nologo', '/Zc:wchar_t', '/Zc:forScope', + defaults.ccFlags = ['/MD', '/nologo', '/D_SCL_SECURE_NO_WARNINGS', '/D_CRT_SECURE_NO_WARNINGS'] if env['MSVC_VERSION'] == '11.0': # Fix compatibility issue between VS2012 and Google Test @@ -226,15 +225,13 @@ elif env['CC'] == 'cl': # Visual Studio defaults.warningFlags = '/W3' elif 'icc' in env.subst('$CC'): - defaults.cxxFlags = '-ftemplate-depth-128' defaults.ccFlags = '-vec-report0 -diag-disable 1478' defaults.debugCcFlags = '-g' - defaults.noOptimizeCcFlags = '-O0 -fno-inline' - defaults.optimizeCcFlags = '-O3 -finline-functions -DNDEBUG' + defaults.noOptimizeCcFlags = '-O0' + defaults.optimizeCcFlags = '-O3 -DNDEBUG' defaults.warningFlags = '-Wcheck' elif 'clang' in env.subst('$CC'): - defaults.cxxFlags = '' defaults.ccFlags = '-fcolor-diagnostics' defaults.debugCcFlags = '-g' defaults.noOptimizeCcFlags = '-O0'