From: sgjesse <sgjesse@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Mon, 8 Sep 2008 15:42:29 +0000 (+0000)
Subject: Added ApplyEnvOverrides to samples build. This makes the build work on Windows
X-Git-Tag: upstream/4.7.83~25430
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7adf58ff63ef98420d5aeb1e69db3e17d2d0af24;p=platform%2Fupstream%2Fv8.git

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
---

diff --git a/SConstruct b/SConstruct
index ca161e1..8df4dab 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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),
diff --git a/samples/SConscript b/samples/SConscript
index bab6641..2583b52 100644
--- a/samples/SConscript
+++ b/samples/SConscript
@@ -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()