Browse Source

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
v0.7.4-release
vegorov@chromium.org 14 years ago
committed by Bert Belder
parent
commit
17bff6082a
  1. 2
      deps/v8/SConstruct
  2. 4
      deps/v8/preparser/SConscript
  3. 4
      deps/v8/samples/SConscript
  4. 4
      deps/v8/test/cctest/SConscript

2
deps/v8/SConstruct

@ -1425,7 +1425,7 @@ def BuildSpecific(env, mode, env_overrides, tools):
preparser_object = preparser_env.SConscript( preparser_object = preparser_env.SConscript(
join('preparser', 'SConscript'), join('preparser', 'SConscript'),
build_dir=join('obj', 'preparser', target_id), build_dir=join('obj', 'preparser', target_id),
exports='context', exports='context tools',
duplicate=False duplicate=False
) )
preparser_name = join('obj', 'preparser', target_id, 'preparser') preparser_name = join('obj', 'preparser', target_id, 'preparser')

4
deps/v8/preparser/SConscript

@ -26,10 +26,10 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from os.path import join from os.path import join
Import('context') Import('context tools')
def ConfigureObjectFiles(): def ConfigureObjectFiles():
env = Environment() env = Environment(tools=tools)
env.Replace(**context.flags['preparser']) env.Replace(**context.flags['preparser'])
context.ApplyEnvOverrides(env) context.ApplyEnvOverrides(env)
return env.Object('preparser-process.cc') return env.Object('preparser-process.cc')

4
deps/v8/samples/SConscript

@ -26,10 +26,10 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from os.path import join from os.path import join
Import('sample context') Import('sample context tools')
def ConfigureObjectFiles(): def ConfigureObjectFiles():
env = Environment() env = Environment(tools=tools)
env.Replace(**context.flags['sample']) env.Replace(**context.flags['sample'])
context.ApplyEnvOverrides(env) context.ApplyEnvOverrides(env)
return env.Object(sample + '.cc') return env.Object(sample + '.cc')

4
deps/v8/test/cctest/SConscript

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

Loading…
Cancel
Save