Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 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 import platform | 6 import platform |
| 7 | 7 |
| 8 Import('env') | 8 Import('env') |
| 9 | 9 |
| 10 # TODO(robertm): consider adding this to the top level scons files | 10 # TODO(robertm): consider adding this to the top level scons files |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 202 elif env.Bit('target_x86_64'): | 202 elif env.Bit('target_x86_64'): |
| 203 ldr_inputs += ['osx/nacl_signal_64.c'] | 203 ldr_inputs += ['osx/nacl_signal_64.c'] |
| 204 else: | 204 else: |
| 205 raise Exception("Unsupported target") | 205 raise Exception("Unsupported target") |
| 206 | 206 |
| 207 | 207 |
| 208 syscall_gen_flags = '-c -a ${TARGET_ARCHITECTURE} -s ${TARGET_SUBARCH}' | 208 syscall_gen_flags = '-c -a ${TARGET_ARCHITECTURE} -s ${TARGET_SUBARCH}' |
| 209 | 209 |
| 210 env.Append(SYSCALL_GEN_FLAGS=syscall_gen_flags) | 210 env.Append(SYSCALL_GEN_FLAGS=syscall_gen_flags) |
| 211 | 211 |
| 212 env.DualLibrary('env_cleanser', ['env_cleanser.c']) | |
| 213 | |
| 214 ldr_inputs += ['env_cleanser'] | |
|
bsy
2011/05/18 18:25:07
doesn't this put a copy of env_cleanser.o in both
Evgeniy Stepanov
2011/05/18 19:05:05
Did not want to include libenv_cleanser in every t
| |
| 215 | |
| 212 env.DualLibrary('sel', ldr_inputs) | 216 env.DualLibrary('sel', ldr_inputs) |
| 213 | 217 |
| 214 env.DualLibrary('env_cleanser', ['env_cleanser.c']) | |
| 215 | |
| 216 env.DualLibrary('nacl_error_code', | 218 env.DualLibrary('nacl_error_code', |
| 217 ['nacl_error_code.c', | 219 ['nacl_error_code.c', |
| 218 ]) | 220 ]) |
| 219 | 221 |
| 220 env.ComponentLibrary('container', | 222 env.ComponentLibrary('container', |
| 221 ['generic_container/container.c', | 223 ['generic_container/container.c', |
| 222 ]) | 224 ]) |
| 223 | 225 |
| 224 | 226 |
| 225 env.ComponentLibrary('nacl_xdr', | 227 env.ComponentLibrary('nacl_xdr', |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 754 | 756 |
| 755 node = env.CommandTest( | 757 node = env.CommandTest( |
| 756 'sel_ldr_thread_death_test.out', | 758 'sel_ldr_thread_death_test.out', |
| 757 command=[sel_ldr_thread_death_test_exe], | 759 command=[sel_ldr_thread_death_test_exe], |
| 758 exit_status='sigabrt') | 760 exit_status='sigabrt') |
| 759 | 761 |
| 760 # TODO(tuduce): Make it work on windows. | 762 # TODO(tuduce): Make it work on windows. |
| 761 env.AddNodeToTestSuite(node, ['medium_tests'], | 763 env.AddNodeToTestSuite(node, ['medium_tests'], |
| 762 'run_sel_ldr_thread_death_test', | 764 'run_sel_ldr_thread_death_test', |
| 763 is_broken=env.Bit('windows')) | 765 is_broken=env.Bit('windows')) |
| OLD | NEW |