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 Import('env') | 6 Import('env') |
7 | 7 |
8 # (elijahtaylor): Removing so braced groups will work for GC syscall wrapping. | 8 # (elijahtaylor): Removing so braced groups will work for GC syscall wrapping. |
9 env.FilterOut(CCFLAGS=['-pedantic']) | 9 env.FilterOut(CCFLAGS=['-pedantic']) |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 valgrind = env.ComponentObject( | 29 valgrind = env.ComponentObject( |
30 'valgrind_annotations.o', | 30 'valgrind_annotations.o', |
31 '${MAIN_DIR}/src/untrusted/valgrind/dynamic_annotations.c') | 31 '${MAIN_DIR}/src/untrusted/valgrind/dynamic_annotations.c') |
32 | 32 |
33 nc_objs = [env.ComponentObject(module, module + '.c') | 33 nc_objs = [env.ComponentObject(module, module + '.c') |
34 for module in [ | 34 for module in [ |
35 'nc_thread', | 35 'nc_thread', |
36 'nc_mutex', | 36 'nc_mutex', |
37 'nc_condvar', | 37 'nc_condvar', |
38 'nc_semaphore', | 38 'nc_semaphore', |
| 39 'nc_rwlock', |
39 'stack_end', | 40 'stack_end', |
40 ] | 41 ] |
41 ] + [valgrind] | 42 ] + [valgrind] |
42 | 43 |
43 # The public library relies on the IRT for crucial system services. | 44 # The public library relies on the IRT for crucial system services. |
44 libpthread = env.ComponentLibrary('libpthread', nc_objs + ['nc_init_irt.c']) | 45 libpthread = env.ComponentLibrary('libpthread', nc_objs + ['nc_init_irt.c']) |
45 env.AddLibraryToSdk(libpthread) | 46 env.AddLibraryToSdk(libpthread) |
46 | 47 |
47 if env.Bit('nonsfi_nacl'): | 48 if env.Bit('nonsfi_nacl'): |
48 nc_private_objs = nc_objs + [ | 49 nc_private_objs = nc_objs + [ |
(...skipping 27 matching lines...) Expand all Loading... |
76 # installed, we ensure that they are in place before they're used. | 77 # installed, we ensure that they are in place before they're used. |
77 for compiler in ['${CC}', '${CXX}']: | 78 for compiler in ['${CC}', '${CXX}']: |
78 # TODO(mcgrathr): This can't be the best way! Ideally we'd just use | 79 # TODO(mcgrathr): This can't be the best way! Ideally we'd just use |
79 # '${CC}' directly in env.Depends and that should be fine for scons. | 80 # '${CC}' directly in env.Depends and that should be fine for scons. |
80 # But sometimes '${CC}' is not just '.../gcc', it's '.../gcc -m32'. | 81 # But sometimes '${CC}' is not just '.../gcc', it's '.../gcc -m32'. |
81 compiler = env.subst(compiler).split()[0] | 82 compiler = env.subst(compiler).split()[0] |
82 env.Depends(env.WhereIs(compiler), n) | 83 env.Depends(env.WhereIs(compiler), n) |
83 else: | 84 else: |
84 n = [] | 85 n = [] |
85 env.Alias('install_libpthread', n) | 86 env.Alias('install_libpthread', n) |
OLD | NEW |