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
This commit is contained in:
parent
172cd39760
commit
29801d4e9b
@ -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')
|
||||
|
@ -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')
|
||||
|
@ -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')
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user