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

Side by Side Diff: pydir/szbuild.py

Issue 610273004: Subzero: Update link path after recent newlib install changes. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 6 years, 2 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 | 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 #!/usr/bin/env python2 1 #!/usr/bin/env python2
2 2
3 import argparse 3 import argparse
4 import os 4 import os
5 import pipes 5 import pipes
6 import re 6 import re
7 import sys 7 import sys
8 8
9 from utils import shellcmd 9 from utils import shellcmd
10 from utils import FindBaseNaCl 10 from utils import FindBaseNaCl
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 shellcmd(( 249 shellcmd((
250 'objcopy -w --localize-symbol="*" {partial}' 250 'objcopy -w --localize-symbol="*" {partial}'
251 ).format(partial=obj_partial), echo=args.verbose) 251 ).format(partial=obj_partial), echo=args.verbose)
252 shellcmd(( 252 shellcmd((
253 'objcopy --globalize-symbol=_user_start {partial}' 253 'objcopy --globalize-symbol=_user_start {partial}'
254 ).format(partial=obj_partial), echo=args.verbose) 254 ).format(partial=obj_partial), echo=args.verbose)
255 shellcmd(( 255 shellcmd((
256 'gcc -m32 {partial} -o {exe} ' + 256 'gcc -m32 {partial} -o {exe} ' +
257 # Keep the rest of this command line (except szrt.c) in sync 257 # Keep the rest of this command line (except szrt.c) in sync
258 # with RunHostLD() in pnacl-translate.py. 258 # with RunHostLD() in pnacl-translate.py.
259 '{root}/toolchain/linux_x86/pnacl_newlib/lib-x86-32-linux/' + 259 '{root}/toolchain/linux_x86/pnacl_newlib/translator/x86-32-linux/lib/' +
260 '{{unsandboxed_irt,irt_query_list}}.o ' + 260 '{{unsandboxed_irt,irt_query_list}}.o ' +
261 '{root}/toolchain_build/src/subzero/runtime/szrt.c ' + 261 '{root}/toolchain_build/src/subzero/runtime/szrt.c ' +
262 '-lpthread -lrt' 262 '-lpthread -lrt'
263 ).format(partial=obj_partial, exe=exe, root=nacl_root), 263 ).format(partial=obj_partial, exe=exe, root=nacl_root),
264 echo=args.verbose) 264 echo=args.verbose)
265 # Put the extra verbose printing at the end. 265 # Put the extra verbose printing at the end.
266 if args.verbose: 266 if args.verbose:
267 print 'PATH={path}'.format(path=os.environ['PATH']) 267 print 'PATH={path}'.format(path=os.environ['PATH'])
268 print 'include={regex}'.format(regex=re_include_str) 268 print 'include={regex}'.format(regex=re_include_str)
269 print 'exclude={regex}'.format(regex=re_exclude_str) 269 print 'exclude={regex}'.format(regex=re_exclude_str)
270 print 'default_match={dm}'.format(dm=default_match) 270 print 'default_match={dm}'.format(dm=default_match)
271 print 'Number of Subzero syms = {num}'.format(num=len(sz_syms)) 271 print 'Number of Subzero syms = {num}'.format(num=len(sz_syms))
272 272
273 if __name__ == '__main__': 273 if __name__ == '__main__':
274 main() 274 main()
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