Commit 7adf58ff authored by sgjesse's avatar sgjesse

Added ApplyEnvOverrides to samples build. This makes the build work on Windows

when the PATH to cl.exe is specified through env overrides. Changed explicit
EVN update with call to ApplyEnvOverrides


git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@213 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 7c2012a9
......@@ -467,7 +467,7 @@ def BuildSpecific(env, mode, env_overrides):
for sample in context.samples:
sample_env = Environment(LIBRARY=library_name)
sample_env.Replace(**context.flags['sample'])
sample_env['ENV'].update(**context.env_overrides)
context.ApplyEnvOverrides(sample_env)
sample_object = sample_env.SConscript(
join('samples', 'SConscript'),
build_dir=join('obj', 'sample', sample, target_id),
......
......@@ -31,6 +31,7 @@ Import('sample context')
def ConfigureObjectFiles():
env = Environment()
env.Replace(**context.flags['sample'])
context.ApplyEnvOverrides(env)
return env.Object(sample + '.cc')
sample_object = ConfigureObjectFiles()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment