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

Side by Side Diff: src/untrusted/nacl/nacl.scons

Issue 758223003: Cleanup: Use Bit('build_ARCH') instead of Bit('target_ARCH') (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Fix + simplify Created 6 years 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 | « src/trusted/validator_x86/build.scons ('k') | src/untrusted/pnacl_dynloader/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 # -*- 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 6
7 Import('env') 7 Import('env')
8 8
9 # NACL_GC_WRAP_SYSCALL uses ({...}) syntax. 9 # NACL_GC_WRAP_SYSCALL uses ({...}) syntax.
10 env.FilterOut(CCFLAGS=['-pedantic']) 10 env.FilterOut(CCFLAGS=['-pedantic'])
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 if env.Bit('nacl_glibc'): 233 if env.Bit('nacl_glibc'):
234 # For nacl-glibc, the standard interfaces are provided by glibc, so 234 # For nacl-glibc, the standard interfaces are provided by glibc, so
235 # we do not build them here. 235 # we do not build them here.
236 sources = SRCS_NACL_EXTENSIONS 236 sources = SRCS_NACL_EXTENSIONS
237 else: 237 else:
238 sources = (SRCS_NACL_EXTENSIONS + 238 sources = (SRCS_NACL_EXTENSIONS +
239 SRCS_NEWLIB_SYSCALL + 239 SRCS_NEWLIB_SYSCALL +
240 SRCS_NEWLIB_STUBS + 240 SRCS_NEWLIB_STUBS +
241 SRCS_NEWLIB_MISC) 241 SRCS_NEWLIB_MISC)
242 if env.Bit('target_arm') and not env.Bit('bitcode'): 242 if env.Bit('build_arm') and not env.Bit('bitcode'):
243 sources.append('aeabi_read_tp.S') 243 sources.append('aeabi_read_tp.S')
244 244
245 # Do not make a shared version of libnacl. 245 # Do not make a shared version of libnacl.
246 libnacl = env.ComponentLibrary('libnacl', sources) 246 libnacl = env.ComponentLibrary('libnacl', sources)
247 247
248 env.AddLibraryToSdk(libnacl) 248 env.AddLibraryToSdk(libnacl)
249 header_install = env.AddHeaderToSdk([ 249 header_install = env.AddHeaderToSdk([
250 'nacl_random.h', 'nacl_startup.h', 'nacl_thread.h']) 250 'nacl_random.h', 'nacl_startup.h', 'nacl_thread.h'])
251 env.Requires('libnacl', header_install) 251 env.Requires('libnacl', header_install)
252 252
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 # single .o file avoids this scenario. 311 # single .o file avoids this scenario.
312 private_combine = [env.ComponentObject(module, '%s.c' % module) 312 private_combine = [env.ComponentObject(module, '%s.c' % module)
313 for module in ['gc_hooks_private', 313 for module in ['gc_hooks_private',
314 'sys_private']] 314 'sys_private']]
315 sys_private.append(env.Command('combined_private${OBJSUFFIX}', 315 sys_private.append(env.Command('combined_private${OBJSUFFIX}',
316 private_combine, 316 private_combine,
317 '${LD} -relocatable -o ${TARGET} ${SOURCES}')) 317 '${LD} -relocatable -o ${TARGET} ${SOURCES}'))
318 318
319 if not env.Bit('nonsfi_nacl'): 319 if not env.Bit('nonsfi_nacl'):
320 env.ComponentLibrary('libnacl_sys_private', sys_private) 320 env.ComponentLibrary('libnacl_sys_private', sys_private)
OLDNEW
« no previous file with comments | « src/trusted/validator_x86/build.scons ('k') | src/untrusted/pnacl_dynloader/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698