| OLD | NEW |
|---|
| 1 # Copyright 2009, Google Inc. | 1 # Copyright 2009, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 | 29 |
| 30 Import('env') | 30 Import('env') |
| 31 | 31 |
| 32 # Don't use -lnosys on ARM - it's automagically included and will spoil |
| 33 # things if included before -lc |
| 34 if env['TARGET_ARCHITECTURE'] == arm: |
| 35 extra_libs = ['pthread'] |
| 36 else: |
| 37 extra_libs = ['pthread', 'nosys'] |
| 32 | 38 |
| 33 env.ComponentProgram('sysbasic.nexe', | 39 env.ComponentProgram('sysbasic.nexe', 'sysbasic.c', EXTRA_LIBS=extra_libs) |
| 34 'sysbasic.c', | |
| 35 EXTRA_LIBS=['pthread', 'nosys']) | |
| 36 | 40 |
| 37 node = env.CommandSelLdrTestNacl( | 41 node = env.CommandSelLdrTestNacl( |
| 38 'sysbasic_test.out', | 42 'sysbasic_test.out', |
| 39 sel_ldr_flags=['-P', '69', '-d'], | 43 sel_ldr_flags=['-P', '69', '-d'], |
| 40 command=[env.File('sysbasic.nexe')], | 44 command=[env.File('sysbasic.nexe')], |
| 41 exit_status='69') | 45 exit_status='69') |
| 42 | 46 |
| 43 env.AddNodeToTestSuite(node, | 47 env.AddNodeToTestSuite(node, |
| 44 ['small_tests', 'sel_ldr_tests'], | 48 ['small_tests', 'sel_ldr_tests'], |
| 45 'run_sysbasic_test') | 49 'run_sysbasic_test') |
| 46 | 50 |
| 47 | 51 |
| 48 env.ComponentProgram('tls_test.nexe', | 52 env.ComponentProgram('tls_test.nexe', |
| 49 'tls_test.c', | 53 'tls_test.c', |
| 50 EXTRA_LIBS=['pthread']) | 54 EXTRA_LIBS=['pthread']) |
| 51 | 55 |
| 52 node = env.CommandSelLdrTestNacl( | 56 node = env.CommandSelLdrTestNacl( |
| 53 'tls_test_test.out', | 57 'tls_test_test.out', |
| 54 command=[env.File('tls_test.nexe')], | 58 command=[env.File('tls_test.nexe')], |
| 55 exit_status='69') | 59 exit_status='69') |
| 56 | 60 |
| 57 env.AddNodeToTestSuite(node, | 61 env.AddNodeToTestSuite(node, |
| 58 ['small_tests', 'sel_ldr_tests'], | 62 ['small_tests', 'sel_ldr_tests'], |
| 59 'run_tls_test') | 63 'run_tls_test') |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1593024:
We should not include -lnosys on ARM: it comes automatically and will spoil... (Closed)
Base URL: http://nativeclient.googlecode.com/svn/trunk/src/native_client/