Author: sgjesse
Date: Mon Sep 8 07:27:19 2008
New Revision: 211
Added:
changes/sgjesse/fix-env-overrides/
changes/sgjesse/fix-env-overrides/bleeding_edge/
- copied from r210, /branches/bleeding_edge/
Modified:
changes/sgjesse/fix-env-overrides/bleeding_edge/SConstruct
changes/sgjesse/fix-env-overrides/bleeding_edge/samples/SConscript
Log:
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
Modified: changes/sgjesse/fix-env-overrides/bleeding_edge/SConstruct
==============================================================================
--- /branches/bleeding_edge/SConstruct (original)
+++ changes/sgjesse/fix-env-overrides/bleeding_edge/SConstruct Mon Sep 8
07:27:19 2008
@@ -467,7 +467,7 @@
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(env)
sample_object = sample_env.SConscript(
join('samples', 'SConscript'),
build_dir=join('obj', 'sample', sample, target_id),
Modified: changes/sgjesse/fix-env-overrides/bleeding_edge/samples/SConscript
==============================================================================
--- /branches/bleeding_edge/samples/SConscript (original)
+++ changes/sgjesse/fix-env-overrides/bleeding_edge/samples/SConscript Mon
Sep 8 07:27:19 2008
@@ -31,6 +31,7 @@
def ConfigureObjectFiles():
env = Environment()
env.Replace(**context.flags['sample'])
+ context.ApplyEnvOverrides(env)
return env.Object(sample + '.cc')
sample_object = ConfigureObjectFiles()
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
