From 6b4ebebd5191f09a49a244aefcd41004aedde4a2 Mon Sep 17 00:00:00 2001 From: hsn <> Date: Mon, 14 Feb 2005 17:29:52 +0000 Subject: [PATCH] scons updated --- SConstruct | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index eef1c24..a7d7a0b 100644 --- a/SConstruct +++ b/SConstruct @@ -1,5 +1,6 @@ # Process this file with http://www.scons.org to build FSP +import os # init Scons EnsureSConsVersion(0,96) PREFIX='/usr/local' @@ -7,15 +8,21 @@ PACKAGE='fsp' VERSION='2.8.1b24' env = Environment(CPPPATH='#/include') +env.Append( ENV = {'HOME': os.environ.get('HOME')} ) +env.Append( ENV = {'DISTCC_HOSTS': os.environ.get('DISTCC_HOSTS')} ) +if os.environ.get('CC'): + env.Replace(CC = os.environ.get('CC')) + # Turn CPPFLAGS to list env.Append( CPPFLAGS = []) +# Get CC from commandline +if ARGUMENTS.get('CC', 0): + env.Replace(CC = ARGUMENTS.get('CC')) #################### Tests ################### # check for other GCC options def checkForGCCOption(conf,option): - if not conf.env['CC'].startswith('gcc'): - return 0 conf.Message("checking whether GCC supports "+option+" ") lastCFLAGS=conf.env['CCFLAGS'] conf.env.Append(CCFLAGS = option)