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