Correctly propagate toolchain setting in SConstruct.

Patch by Bert Belder.

Review URL: http://codereview.chromium.org/7309014

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8555 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/SConstruct b/SConstruct
index 7ee9f136ab5148ceb9cdbab7919fbfe753f53e22..d8d41c08ead780d91a9ea9a2588d16d1cd8a0567 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1425,7 +1425,7 @@ def BuildSpecific(env, mode, env_overrides, tools):
   preparser_object = preparser_env.SConscript(
     join('preparser', 'SConscript'),
     build_dir=join('obj', 'preparser', target_id),
-    exports='context',
+    exports='context tools',
     duplicate=False
   )
   preparser_name = join('obj', 'preparser', target_id, 'preparser')

diff --git a/preparser/SConscript b/preparser/SConscript
index 1d51e826cc8dbb4317cb786b1378ced4b3421452..10b3953193624983b782e290da5bd7f0fe7db654 100644 (file)
--- a/preparser/SConscript
+++ b/preparser/SConscript
@@ -26,10 +26,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from os.path import join
-Import('context')
+Import('context tools')
 
 def ConfigureObjectFiles():
-  env = Environment()
+  env = Environment(tools=tools)
   env.Replace(**context.flags['preparser'])
   context.ApplyEnvOverrides(env)
   return env.Object('preparser-process.cc')

diff --git a/samples/SConscript b/samples/SConscript
index 31990b681be324c4c3681d10b928c02833fb4dae..84c48c9047b694b965319d09f59e3f12491d468e 100644 (file)
--- a/samples/SConscript
+++ b/samples/SConscript
@@ -26,10 +26,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from os.path import join
-Import('sample context')
+Import('sample context tools')
 
 def ConfigureObjectFiles():
-  env = Environment()
+  env = Environment(tools=tools)
   env.Replace(**context.flags['sample'])
   context.ApplyEnvOverrides(env)
   return env.Object(sample + '.cc')

diff --git a/test/cctest/SConscript b/test/cctest/SConscript
index 0197178cf2b8089455475206104653c8dcbb5230..c3614b65413b244763ac1a8ff6610403701c2d68 100644 (file)
--- a/test/cctest/SConscript
+++ b/test/cctest/SConscript
@@ -29,7 +29,7 @@ import sys
 from os.path import join, dirname, abspath
 root_dir = dirname(File('SConstruct').rfile().abspath)
 sys.path.append(join(root_dir, 'tools'))
-Import('context object_files')
+Import('context object_files tools')
 
 
 SOURCES = {
@@ -107,7 +107,7 @@ SOURCES = {
 
 def Build():
   cctest_files = context.GetRelevantSources(SOURCES)
-  env = Environment()
+  env = Environment(tools=tools)
   env.Replace(**context.flags['cctest'])
   context.ApplyEnvOverrides(env)
   # There seems to be a glitch in the way scons decides where to put