| OLD | NEW |
| 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 Loading... |
| 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 Loading... |
| 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) |
| OLD | NEW |