| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2014 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 # We could build nonsfi_loader on Mac OS X, but for now we are only testing | 8 # We could build nonsfi_loader on Mac OS X, but for now we are only testing |
| 9 # this on Linux. | 9 # this on Linux. |
| 10 if not env.Bit('linux') and not env.Bit('nonsfi_nacl'): | 10 if not env.Bit('linux') and not env.Bit('nonsfi_nacl'): |
| 11 Return() | 11 Return() |
| 12 | 12 |
| 13 # Since we are only targeting Unix, not Windows/MSVC, we can use C99 | 13 # Since we are only targeting Unix, not Windows/MSVC, we can use C99 |
| 14 # language features. | 14 # language features. |
| 15 env.FilterOut(CFLAGS='-Wdeclaration-after-statement') | 15 env.FilterOut(CFLAGS='-Wdeclaration-after-statement') |
| 16 | 16 |
| 17 extra_libs = ['irt_nonsfi', 'platform'] | 17 extra_libs = ['irt_nonsfi', 'nacl_random_private', 'platform'] |
| 18 if env['NACL_BUILD_FAMILY'] == 'UNTRUSTED': | 18 if env['NACL_BUILD_FAMILY'] == 'UNTRUSTED': |
| 19 extra_libs.append('${NONIRT_LIBS}') | 19 extra_libs.append('${NONIRT_LIBS}') |
| 20 env.ComponentProgram('nonsfi_loader', | 20 env.ComponentProgram('nonsfi_loader', |
| 21 ['elf_loader.c', 'elf_loader_main.c'], | 21 ['elf_loader.c', 'elf_loader_main.c'], |
| 22 EXTRA_LIBS=extra_libs) | 22 EXTRA_LIBS=extra_libs) |
| OLD | NEW |