| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright 2009 The Native Client Authors. All rights reserved. | 2 # Copyright 2009 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can | 3 # Use of this source code is governed by a BSD-style license that can |
| 4 # be found in the LICENSE file. | 4 # be found in the LICENSE file. |
| 5 | 5 |
| 6 import os | 6 import os |
| 7 | 7 |
| 8 Import('env') | 8 Import('env') |
| 9 | 9 |
| 10 # nrd_xfer.c needs no-strict-aliasing because NaClImcMsgIoVec and | 10 # nrd_xfer.c needs no-strict-aliasing because NaClImcMsgIoVec and |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 'nrd_all_modules.c', | 50 'nrd_all_modules.c', |
| 51 nrd_xfer_obj, | 51 nrd_xfer_obj, |
| 52 wrapper_obj, | 52 wrapper_obj, |
| 53 ] | 53 ] |
| 54 | 54 |
| 55 if env.Bit('windows'): | 55 if env.Bit('windows'): |
| 56 nrd_lib_inputs += ['win/nacl_desc.c'] | 56 nrd_lib_inputs += ['win/nacl_desc.c'] |
| 57 else: | 57 else: |
| 58 nrd_lib_inputs += ['posix/nacl_desc.c'] | 58 nrd_lib_inputs += ['posix/nacl_desc.c'] |
| 59 | 59 |
| 60 if env.Bit('linux') and not env.Bit('android'): | |
| 61 nrd_lib_inputs += ['linux/nacl_desc_sysv_shm.c'] | |
| 62 | |
| 63 if env.Bit('windows'): | 60 if env.Bit('windows'): |
| 64 nrd_lib_inputs += [ | 61 nrd_lib_inputs += [ |
| 65 'nacl_desc_conn_cap.c', | 62 'nacl_desc_conn_cap.c', |
| 66 'nacl_desc_imc_bound_desc.c', | 63 'nacl_desc_imc_bound_desc.c', |
| 67 'nacl_makeboundsock.c', | 64 'nacl_makeboundsock.c', |
| 68 ] | 65 ] |
| 69 else: | 66 else: |
| 70 nrd_lib_inputs += [ | 67 nrd_lib_inputs += [ |
| 71 'posix/nacl_desc_conn_cap.c', | 68 'posix/nacl_desc_conn_cap.c', |
| 72 'posix/nacl_desc_imc_bound_desc.c', | 69 'posix/nacl_desc_imc_bound_desc.c', |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 env.AddNodeToTestSuite(node, ['small_tests'], | 119 env.AddNodeToTestSuite(node, ['small_tests'], |
| 123 'run_nacl_desc_io_alloc_ctor_test') | 120 'run_nacl_desc_io_alloc_ctor_test') |
| 124 | 121 |
| 125 | 122 |
| 126 # TODO: add comment | 123 # TODO: add comment |
| 127 if env.Bit('windows'): | 124 if env.Bit('windows'): |
| 128 env.Append(LIBS = [ 'ws2_32', 'advapi32' ]) | 125 env.Append(LIBS = [ 'ws2_32', 'advapi32' ]) |
| 129 | 126 |
| 130 env.EnsureRequiredBuildWarnings() | 127 env.EnsureRequiredBuildWarnings() |
| 131 nrd_xfer_env.EnsureRequiredBuildWarnings() | 128 nrd_xfer_env.EnsureRequiredBuildWarnings() |
| OLD | NEW |