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

Side by Side Diff: src/trusted/service_runtime/build.scons

Issue 12288068: Reset LIBPATH to fix the build of MIPS nacl_helper_bootstrap on Ubuntu Precise (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import platform 6 import platform
7 import os 7 import os
8 8
9 Import('env') 9 Import('env')
10 10
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 # a "build environment" environment. We need to compile this program 437 # a "build environment" environment. We need to compile this program
438 # with native defaults for where we're being built, i.e. for x86-64 438 # with native defaults for where we're being built, i.e. for x86-64
439 # when the host is x86-64 but platform=x86-32. 439 # when the host is x86-64 but platform=x86-32.
440 munge_env = env.Clone(BUILD_TYPE='gen', 440 munge_env = env.Clone(BUILD_TYPE='gen',
441 BUILD_TYPE_DESCRIPTION='build-host generation', 441 BUILD_TYPE_DESCRIPTION='build-host generation',
442 NACL_BUILD_FAMILY='TRUSTED_BUILD', 442 NACL_BUILD_FAMILY='TRUSTED_BUILD',
443 CC='cc', 443 CC='cc',
444 LINK='${CC}', 444 LINK='${CC}',
445 CCFLAGS=['-O2'], 445 CCFLAGS=['-O2'],
446 LINKFLAGS=[], 446 LINKFLAGS=[],
447 ) 447 LIBPATH=[])
448 bootstrap_munge = munge_env.Program( 448 bootstrap_munge = munge_env.Program(
449 'nacl_bootstrap_munge_phdr', 449 'nacl_bootstrap_munge_phdr',
450 ['linux/nacl_bootstrap_munge_phdr.c'], 450 ['linux/nacl_bootstrap_munge_phdr.c'],
451 LIBS=['elf']) 451 LIBS=['elf'])
452 452
453 bootstrap_prog = bootstrap_env.Command( 453 bootstrap_prog = bootstrap_env.Command(
454 'nacl_helper_bootstrap', 454 'nacl_helper_bootstrap',
455 [bootstrap_env.File('linux/nacl_bootstrap_munge_phdr.py'), 455 [bootstrap_env.File('linux/nacl_bootstrap_munge_phdr.py'),
456 bootstrap_munge, bootstrap_raw], 456 bootstrap_munge, bootstrap_raw],
457 '${PYTHON} ${SOURCES} ${TARGET}' 457 '${PYTHON} ${SOURCES} ${TARGET}'
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 node = env.CommandTest( 1008 node = env.CommandTest(
1009 'nacl_error_log_test.out', 1009 'nacl_error_log_test.out',
1010 command=[exe], 1010 command=[exe],
1011 exit_status=expected_exit, 1011 exit_status=expected_exit,
1012 filter_regex='"(NaClCrashLogWriter.*)|(This is a test of the emergency.*)"', 1012 filter_regex='"(NaClCrashLogWriter.*)|(This is a test of the emergency.*)"',
1013 filter_group_only='true', 1013 filter_group_only='true',
1014 stdout_golden=env.File('nacl_error_log_test.stdout')) 1014 stdout_golden=env.File('nacl_error_log_test.stdout'))
1015 1015
1016 env.AddNodeToTestSuite(node, ['small_tests'], 1016 env.AddNodeToTestSuite(node, ['small_tests'],
1017 'run_nacl_error_log_test') 1017 'run_nacl_error_log_test')
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698