| 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 atexit | 6 import atexit |
| 7 import os | 7 import os |
| 8 import platform | 8 import platform |
| 9 import re | 9 import re |
| 10 import subprocess | 10 import subprocess |
| (...skipping 2703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2714 print 'Not installing', dest | 2714 print 'Not installing', dest |
| 2715 # Replace build commands with no-ops | 2715 # Replace build commands with no-ops |
| 2716 env.Replace(CC='true', CXX='true', LD='true', | 2716 env.Replace(CC='true', CXX='true', LD='true', |
| 2717 AR='true', RANLIB='true', INSTALL=FakeInstall) | 2717 AR='true', RANLIB='true', INSTALL=FakeInstall) |
| 2718 else: | 2718 else: |
| 2719 tc_dir = os.path.join(os.getcwd(), 'toolchain', 'linux_mips-trusted', | 2719 tc_dir = os.path.join(os.getcwd(), 'toolchain', 'linux_mips-trusted', |
| 2720 'bin') | 2720 'bin') |
| 2721 if not which(os.path.join(tc_dir, 'mipsel-linux-gnu-gcc')): | 2721 if not which(os.path.join(tc_dir, 'mipsel-linux-gnu-gcc')): |
| 2722 print ("\nERRROR: MIPS trusted TC is not installed - try running:\n" | 2722 print ("\nERRROR: MIPS trusted TC is not installed - try running:\n" |
| 2723 "tools/trusted_cross_toolchains/trusted-toolchain-creator" | 2723 "tools/trusted_cross_toolchains/trusted-toolchain-creator" |
| 2724 ".mipsel.squeeze.sh trusted_sdk") | 2724 ".mipsel.squeeze.sh nacl_sdk") |
| 2725 sys.exit(-1) | 2725 sys.exit(-1) |
| 2726 env.Replace(CC=os.path.join(tc_dir, 'mipsel-linux-gnu-gcc'), | 2726 env.Replace(CC=os.path.join(tc_dir, 'mipsel-linux-gnu-gcc'), |
| 2727 CXX=os.path.join(tc_dir, 'mipsel-linux-gnu-g++'), | 2727 CXX=os.path.join(tc_dir, 'mipsel-linux-gnu-g++'), |
| 2728 LD=os.path.join(tc_dir, 'mipsel-linux-gnu-ld'), | 2728 LD=os.path.join(tc_dir, 'mipsel-linux-gnu-ld'), |
| 2729 ASFLAGS=[], | 2729 ASFLAGS=[], |
| 2730 LIBPATH=['${LIB_DIR}', | 2730 LIBPATH=['${LIB_DIR}', |
| 2731 jail + '/sysroot/usr/lib'], | 2731 jail + '/sysroot/usr/lib'], |
| 2732 LINKFLAGS=['-T', | 2732 LINKFLAGS=['-T', |
| 2733 os.path.join(jail, 'ld_script_mips_trusted')] | 2733 os.path.join(jail, 'ld_script_mips_trusted')] |
| 2734 ) | 2734 ) |
| (...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3822 nacl_env.ValidateSdk() | 3822 nacl_env.ValidateSdk() |
| 3823 | 3823 |
| 3824 if BROKEN_TEST_COUNT > 0: | 3824 if BROKEN_TEST_COUNT > 0: |
| 3825 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 3825 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
| 3826 if GetOption('brief_comstr'): | 3826 if GetOption('brief_comstr'): |
| 3827 msg += " Add --verbose to the command line for more information." | 3827 msg += " Add --verbose to the command line for more information." |
| 3828 print msg | 3828 print msg |
| 3829 | 3829 |
| 3830 # separate warnings from actual build output | 3830 # separate warnings from actual build output |
| 3831 Banner('B U I L D - O U T P U T:') | 3831 Banner('B U I L D - O U T P U T:') |
| OLD | NEW |