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

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

Issue 14876015: Add wrapper library for the nacl_irt_exception_handling IRT interface (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Cleanup + remove minidump_generator.gyp for now because of pthread.h problem in Gyp build Created 7 years, 7 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/nacl/nacl.gyp ('k') | src/untrusted/nacl/nacl_exception.c » ('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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 env.AddLibraryToSdk(libnacl) 96 env.AddLibraryToSdk(libnacl)
97 header_install = env.AddHeaderToSdk(['nacl_startup.h', 'nacl_thread.h']) 97 header_install = env.AddHeaderToSdk(['nacl_startup.h', 'nacl_thread.h'])
98 env.Requires('libnacl', header_install) 98 env.Requires('libnacl', header_install)
99 99
100 libnacl_dyncode = env.NaClSdkLibrary('libnacl_dyncode', ['dyncode.c']) 100 libnacl_dyncode = env.NaClSdkLibrary('libnacl_dyncode', ['dyncode.c'])
101 env.AddLibraryToSdk(libnacl_dyncode) 101 env.AddLibraryToSdk(libnacl_dyncode)
102 env.AddHeaderToSdk(['nacl_dyncode.h']) 102 env.AddHeaderToSdk(['nacl_dyncode.h'])
103 env.ComponentLibrary('libnacl_dyncode_private', ['dyncode_private.c']) 103 env.ComponentLibrary('libnacl_dyncode_private', ['dyncode_private.c'])
104 104
105 libnacl_exception = env.NaClSdkLibrary('libnacl_exception',
106 ['nacl_exception.c'])
107 env.AddLibraryToSdk(libnacl_exception)
108
105 libnacl_list_mappings = env.NaClSdkLibrary( 109 libnacl_list_mappings = env.NaClSdkLibrary(
106 'libnacl_list_mappings', ['list_mappings.c']) 110 'libnacl_list_mappings', ['list_mappings.c'])
107 env.AddLibraryToSdk(libnacl_list_mappings) 111 env.AddLibraryToSdk(libnacl_list_mappings)
108 env.AddHeaderToSdk(['nacl_list_mappings.h']) 112 env.AddHeaderToSdk(['nacl_list_mappings.h'])
109 env.ComponentLibrary( 113 env.ComponentLibrary(
110 'libnacl_list_mappings_private', ['list_mappings_private.c']) 114 'libnacl_list_mappings_private', ['list_mappings_private.c'])
111 115
112 env.AddHeaderToSdk(['pnacl.h']) 116 env.AddHeaderToSdk(['pnacl.h'])
113 117
114 118
(...skipping 30 matching lines...) Expand all
145 # Putting everything important into a single .o file avoids this scenario. 149 # Putting everything important into a single .o file avoids this scenario.
146 private_combine = [env.ComponentObject(module, '%s.c' % module) 150 private_combine = [env.ComponentObject(module, '%s.c' % module)
147 for module in ['gc_hooks_private', 151 for module in ['gc_hooks_private',
148 'sbrk_private', 152 'sbrk_private',
149 'sys_private']] 153 'sys_private']]
150 sys_private.append(env.Command('combined_private${OBJSUFFIX}', 154 sys_private.append(env.Command('combined_private${OBJSUFFIX}',
151 private_combine, 155 private_combine,
152 '${LD} -relocatable -o ${TARGET} ${SOURCES}')) 156 '${LD} -relocatable -o ${TARGET} ${SOURCES}'))
153 157
154 env.ComponentLibrary('libnacl_sys_private', sys_private) 158 env.ComponentLibrary('libnacl_sys_private', sys_private)
OLDNEW
« no previous file with comments | « src/untrusted/nacl/nacl.gyp ('k') | src/untrusted/nacl/nacl_exception.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698