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: site_scons/site_tools/naclsdk.py

Issue 9695064: Simplify GetTranslatedNexe() (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Rebase Created 8 years, 9 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 | « SConstruct ('k') | tests/minnacl/nacl.scons » ('j') | 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/python 1 #!/usr/bin/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 """Nacl SDK tool SCons.""" 6 """Nacl SDK tool SCons."""
7 7
8 import __builtin__ 8 import __builtin__
9 import re 9 import re
10 import os 10 import os
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 arch = env['TARGET_FULLARCH'] 214 arch = env['TARGET_FULLARCH']
215 assert arch in ['arm', 'arm-thumb2', 'x86-32', 'x86-64'] 215 assert arch in ['arm', 'arm-thumb2', 'x86-32', 'x86-64']
216 216
217 arch_flag = ' -arch %s' % arch 217 arch_flag = ' -arch %s' % arch
218 if env.Bit('pnacl_generate_pexe'): 218 if env.Bit('pnacl_generate_pexe'):
219 ld_arch_flag = '' 219 ld_arch_flag = ''
220 else: 220 else:
221 ld_arch_flag = arch_flag 221 ld_arch_flag = arch_flag
222 222
223
224 if env.Bit('nacl_glibc'): 223 if env.Bit('nacl_glibc'):
225 subroot = root + '/glibc' 224 subroot = root + '/glibc'
226 else: 225 else:
227 subroot = root + '/newlib' 226 subroot = root + '/newlib'
228 227
229 binprefix = os.path.join(subroot, 'bin', 'pnacl-') 228 binprefix = os.path.join(subroot, 'bin', 'pnacl-')
230 binext = '' 229 binext = ''
231 if env.Bit('host_windows'): 230 if env.Bit('host_windows'):
232 binext = '.bat' 231 binext = '.bat'
233 232
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 # Dependency files it produces are to be found in ${LIBPATH}. 608 # Dependency files it produces are to be found in ${LIBPATH}.
610 # It is applied recursively to those dependencies in case 609 # It is applied recursively to those dependencies in case
611 # some of them are linker scripts too. 610 # some of them are linker scripts too.
612 ldscript_scanner = SCons.Scanner.Base( 611 ldscript_scanner = SCons.Scanner.Base(
613 function=ScanLinkerScript, 612 function=ScanLinkerScript,
614 skeys=['.a', '.so', '.pso'], 613 skeys=['.a', '.so', '.pso'],
615 path_function=SCons.Scanner.FindPathDirs('LIBPATH'), 614 path_function=SCons.Scanner.FindPathDirs('LIBPATH'),
616 recursive=True 615 recursive=True
617 ) 616 )
618 env.Append(SCANNERS=ldscript_scanner) 617 env.Append(SCANNERS=ldscript_scanner)
OLDNEW
« no previous file with comments | « SConstruct ('k') | tests/minnacl/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698