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

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

Issue 25027006: Stackable IRT Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « src/untrusted/irt/nacl.scons ('k') | src/untrusted/nacl/nacl_irt.h » ('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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 'pthread_stubs.c', # weak version of __pthread_initialize 130 'pthread_stubs.c', # weak version of __pthread_initialize
131 'tls.c', 131 'tls.c',
132 ] 132 ]
133 133
134 134
135 # used by both glibc and newlib 135 # used by both glibc and newlib
136 SRCS_NACL_EXTENSIONS = [ 136 SRCS_NACL_EXTENSIONS = [
137 'gc_hooks.c', 137 'gc_hooks.c',
138 'nacl_irt.c', 138 'nacl_irt.c',
139 'nacl_irt_init.c', 139 'nacl_irt_init.c',
140 'nacl_irt_module.c',
140 'nacl_tls_get.c', 141 'nacl_tls_get.c',
141 'nacl_tls_init.c', 142 'nacl_tls_init.c',
142 ] 143 ]
143 144
144 if env.Bit('nacl_glibc'): 145 if env.Bit('nacl_glibc'):
145 # For nacl-glibc, the standard interfaces are provided by glibc, so 146 # For nacl-glibc, the standard interfaces are provided by glibc, so
146 # we do not build them here. 147 # we do not build them here.
147 sources = SRCS_NACL_EXTENSIONS 148 sources = SRCS_NACL_EXTENSIONS
148 else: 149 else:
149 sources = (SRCS_NACL_EXTENSIONS + 150 sources = (SRCS_NACL_EXTENSIONS +
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 # the libnacl_sys_private one. Putting everything important into a 213 # the libnacl_sys_private one. Putting everything important into a
213 # single .o file avoids this scenario. 214 # single .o file avoids this scenario.
214 private_combine = [env.ComponentObject(module, '%s.c' % module) 215 private_combine = [env.ComponentObject(module, '%s.c' % module)
215 for module in ['gc_hooks_private', 216 for module in ['gc_hooks_private',
216 'sys_private']] 217 'sys_private']]
217 sys_private.append(env.Command('combined_private${OBJSUFFIX}', 218 sys_private.append(env.Command('combined_private${OBJSUFFIX}',
218 private_combine, 219 private_combine,
219 '${LD} -relocatable -o ${TARGET} ${SOURCES}')) 220 '${LD} -relocatable -o ${TARGET} ${SOURCES}'))
220 221
221 env.ComponentLibrary('libnacl_sys_private', sys_private) 222 env.ComponentLibrary('libnacl_sys_private', sys_private)
OLDNEW
« no previous file with comments | « src/untrusted/irt/nacl.scons ('k') | src/untrusted/nacl/nacl_irt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698