Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Side by Side Diff: SConstruct

Issue 7309014: Correctly propagate toolchain setting in SConstruct. (Closed)
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | preparser/SConscript » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2011 the V8 project authors. All rights reserved. 1 # Copyright 2011 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1418 ) 1418 )
1419 context.cctest_targets.append(cctest_program) 1419 context.cctest_targets.append(cctest_program)
1420 1420
1421 preparser_env = env.Copy() 1421 preparser_env = env.Copy()
1422 preparser_env.Replace(**context.flags['preparser']) 1422 preparser_env.Replace(**context.flags['preparser'])
1423 preparser_env.Prepend(LIBS=[preparser_library_name]) 1423 preparser_env.Prepend(LIBS=[preparser_library_name])
1424 context.ApplyEnvOverrides(preparser_env) 1424 context.ApplyEnvOverrides(preparser_env)
1425 preparser_object = preparser_env.SConscript( 1425 preparser_object = preparser_env.SConscript(
1426 join('preparser', 'SConscript'), 1426 join('preparser', 'SConscript'),
1427 build_dir=join('obj', 'preparser', target_id), 1427 build_dir=join('obj', 'preparser', target_id),
1428 exports='context', 1428 exports='context tools',
1429 duplicate=False 1429 duplicate=False
1430 ) 1430 )
1431 preparser_name = join('obj', 'preparser', target_id, 'preparser') 1431 preparser_name = join('obj', 'preparser', target_id, 'preparser')
1432 preparser_program = preparser_env.Program(preparser_name, preparser_object); 1432 preparser_program = preparser_env.Program(preparser_name, preparser_object);
1433 preparser_env.Depends(preparser_program, preparser_library) 1433 preparser_env.Depends(preparser_program, preparser_library)
1434 context.preparser_targets.append(preparser_program) 1434 context.preparser_targets.append(preparser_program)
1435 1435
1436 return context 1436 return context
1437 1437
1438 1438
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 # version of scons. Also, there's a bug in some revisions that 1483 # version of scons. Also, there's a bug in some revisions that
1484 # doesn't allow this flag to be set, so we swallow any exceptions. 1484 # doesn't allow this flag to be set, so we swallow any exceptions.
1485 # Lovely. 1485 # Lovely.
1486 try: 1486 try:
1487 SetOption('warn', 'no-deprecated') 1487 SetOption('warn', 'no-deprecated')
1488 except: 1488 except:
1489 pass 1489 pass
1490 1490
1491 1491
1492 Build() 1492 Build()
OLDNEW
« no previous file with comments | « no previous file | preparser/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698