From b65a27e513e8f05b1220ef3075399ec1a572d2c9 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 13 Mar 2014 02:19:15 +0000
Subject: [PATCH] [SCons] Extract common default compiler flags

---
 SConstruct | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/SConstruct b/SConstruct
index 1e64f2734..ee061a443 100644
--- a/SConstruct
+++ b/SConstruct
@@ -197,19 +197,16 @@ opts.Update(env)
 
 defaults.cxxFlags = ''
 defaults.ccFlags = ''
-defaults.noOptimizeCcFlags = ''
-defaults.optimizeCcFlags = ''
-defaults.debugCcFlags = ''
+defaults.noOptimizeCcFlags = '-O0'
+defaults.optimizeCcFlags = '-O3'
+defaults.debugCcFlags = '-g'
 defaults.noDebugCcFlags = ''
 defaults.debugLinkFlags = ''
 defaults.noDebugLinkFlags = ''
-defaults.warningFlags = ''
+defaults.warningFlags = '-Wall'
 
 if 'gcc' in env.subst('$CC'):
-    defaults.debugCcFlags = '-g'
-    defaults.noOptimizeCcFlags = '-O0'
-    defaults.optimizeCcFlags = '-O3 -Wno-inline'
-    defaults.warningFlags = '-Wall'
+    defaults.optimizeCcFlags += ' -Wno-inline'
 
 elif env['CC'] == 'cl': # Visual Studio
     defaults.cxxFlags = ['/EHsc']
@@ -226,17 +223,10 @@ elif env['CC'] == 'cl': # Visual Studio
 
 elif 'icc' in env.subst('$CC'):
     defaults.ccFlags = '-vec-report0 -diag-disable 1478'
-    defaults.debugCcFlags = '-g'
-    defaults.noOptimizeCcFlags = '-O0'
-    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'
-    defaults.warningFlags = '-Wall'
 
 else:
     print "WARNING: Unrecognized C compiler '%s'" % env['CC']