Mesa (master): Allow the environment to override certain flags.

Alan Hourihane alanh at kemper.freedesktop.org
Tue Jan 26 19:14:53 UTC 2010


Module: Mesa
Branch: master
Commit: 6544be622363674430f70ca262629334d25b350a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6544be622363674430f70ca262629334d25b350a

Author: Alan Hourihane <alanh at vmware.com>
Date:   Tue Jan 26 19:14:16 2010 +0000

Allow the environment to override certain flags.

---

 SConstruct |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/SConstruct b/SConstruct
index ff06b9b..0770fe4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -59,6 +59,17 @@ env = Environment(
 	ENV = os.environ,
 )
 
+if os.environ.has_key('CC'):
+	env['CC'] = os.environ['CC']
+if os.environ.has_key('CFLAGS'):
+	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+if os.environ.has_key('CXX'):
+	env['CXX'] = os.environ['CXX']
+if os.environ.has_key('CXXFLAGS'):
+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+if os.environ.has_key('LDFLAGS'):
+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+
 Help(opts.GenerateHelpText(env))
 
 # replicate options values in local variables




More information about the mesa-commit mailing list