From 66998a5ae17222e65a6818047617413317754c13 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sun, 12 Feb 2017 17:39:13 -0500 Subject: [PATCH] [SCons] Keep SCons initial PATH when propagating PATH Fixes errors on Windows when Visual Studio is not on the PATH but has been found by SCons instead. --- SConstruct | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 0b4589934..f16281a01 100644 --- a/SConstruct +++ b/SConstruct @@ -693,9 +693,12 @@ if env['env_vars'] == 'all': elif env['env_vars']: for name in env['env_vars'].split(','): if name in os.environ: - env['ENV'][name] = os.environ[name] + if name == 'PATH': + env.AppendENVPath('PATH', os.environ['PATH']) + else: + env['ENV'][name] = os.environ[name] if env['VERBOSE']: - print 'Propagating environment variable {0}={1}'.format(name, os.environ[name]) + print 'Propagating environment variable {0}={1}'.format(name, env['ENV'][name]) elif name not in defaults.env_vars.split(','): print 'WARNING: failed to propagate environment variable', repr(name) print ' Edit cantera.conf or the build command line to fix this.'