From 18e8d7ed2d6d669e9537984837e4ec1fa466e7d1 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 8 May 2012 07:49:57 -0700 Subject: [PATCH] scons: allow override of SWIG binary on command line --- SConstruct | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 8bfc41951..415af6ca7 100755 --- a/SConstruct +++ b/SConstruct @@ -178,7 +178,7 @@ termcap = get_termcap(GetOption('use_colors')) # ######################################################################## use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'LD_LIBRARY_PATH', 'PATH', - 'PYTHONPATH', 'RANLIB' ]) + 'PYTHONPATH', 'RANLIB', 'SWIG' ]) use_env = {} for key,val in os.environ.iteritems(): @@ -348,6 +348,7 @@ global_vars = Variables(global_vars_file, args=ARGUMENTS) global_vars.AddVariables( ('CC', 'C compiler', environ.get('CC', main['CC'])), ('CXX', 'C++ compiler', environ.get('CXX', main['CXX'])), + ('SWIG', 'SWIG tool', environ.get('SWIG', main['SWIG'])), ('BATCH', 'Use batch pool for build and tests', False), ('BATCH_CMD', 'Batch pool submission command name', 'qdo'), ('M5_BUILD_CACHE', 'Cache built objects in this directory', False),