diff options
| author | vegorov@chromium.org <vegorov@chromium.org> | 2011-07-06 16:36:05 +0400 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2011-07-16 02:40:32 +0400 |
| commit | 17bff6082a957515668e30fbf170d1356a92674f (patch) | |
| tree | 2bf97654d90e2511bf220eca9304dad05a515881 /deps | |
| parent | 442c5c95adeb44700eda9b25d773d3f285ccfe3c (diff) | |
Correctly propagate toolchain setting in SConstruct.
Patch by Bert Belder.
Review URL: http://codereview.chromium.org/7309014
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@8555 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/SConstruct | 2 | ||||
| -rw-r--r-- | deps/v8/preparser/SConscript | 4 | ||||
| -rw-r--r-- | deps/v8/samples/SConscript | 4 | ||||
| -rw-r--r-- | deps/v8/test/cctest/SConscript | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/deps/v8/SConstruct b/deps/v8/SConstruct index 7ee9f136ab5..d8d41c08ead 100644 --- a/deps/v8/SConstruct +++ b/deps/v8/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/deps/v8/preparser/SConscript b/deps/v8/preparser/SConscript index 1d51e826cc8..10b39531936 100644 --- a/deps/v8/preparser/SConscript +++ b/deps/v8/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/deps/v8/samples/SConscript b/deps/v8/samples/SConscript index 31990b681be..84c48c9047b 100644 --- a/deps/v8/samples/SConscript +++ b/deps/v8/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/deps/v8/test/cctest/SConscript b/deps/v8/test/cctest/SConscript index 0197178cf2b..c3614b65413 100644 --- a/deps/v8/test/cctest/SConscript +++ b/deps/v8/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 |