| 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 json | 7 import json |
| 8 import os | 8 import os |
| 9 import platform | 9 import platform |
| 10 import re | 10 import re |
| (...skipping 2740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2751 if env.Bit('built_elsewhere'): | 2751 if env.Bit('built_elsewhere'): |
| 2752 def FakeInstall(dest, source, env): | 2752 def FakeInstall(dest, source, env): |
| 2753 print 'Not installing', dest | 2753 print 'Not installing', dest |
| 2754 # Replace build commands with no-ops | 2754 # Replace build commands with no-ops |
| 2755 env.Replace(CC='true', CXX='true', LD='true', | 2755 env.Replace(CC='true', CXX='true', LD='true', |
| 2756 AR='true', RANLIB='true', INSTALL=FakeInstall) | 2756 AR='true', RANLIB='true', INSTALL=FakeInstall) |
| 2757 else: | 2757 else: |
| 2758 tc_dir = os.path.join(jail, 'bin') | 2758 tc_dir = os.path.join(jail, 'bin') |
| 2759 if not which(os.path.join(tc_dir, 'mipsel-linux-gnu-gcc')): | 2759 if not which(os.path.join(tc_dir, 'mipsel-linux-gnu-gcc')): |
| 2760 raise UserError("\nERRROR: " | 2760 raise UserError("\nERRROR: " |
| 2761 "MIPS trusted TC is not installed - try running:\n" | 2761 "MIPS trusted toolchain not found - try running:\n" |
| 2762 "tools/trusted_cross_toolchains/trusted-toolchain-creator" | 2762 " build/package_version/package_version.py --packages" |
| 2763 " linux_x86/mips_trusted sync -x\n" |
| 2764 "Or build it yourself with:\n" |
| 2765 " tools/trusted_cross_toolchains/trusted-toolchain-creator" |
| 2763 ".mipsel.debian.sh nacl_sdk") | 2766 ".mipsel.debian.sh nacl_sdk") |
| 2764 env.Replace(CC=os.path.join(tc_dir, 'mipsel-linux-gnu-gcc'), | 2767 env.Replace(CC=os.path.join(tc_dir, 'mipsel-linux-gnu-gcc'), |
| 2765 CXX=os.path.join(tc_dir, 'mipsel-linux-gnu-g++'), | 2768 CXX=os.path.join(tc_dir, 'mipsel-linux-gnu-g++'), |
| 2766 LD=os.path.join(tc_dir, 'mipsel-linux-gnu-ld'), | 2769 LD=os.path.join(tc_dir, 'mipsel-linux-gnu-ld'), |
| 2767 ASFLAGS=[], | 2770 ASFLAGS=[], |
| 2768 LIBPATH=['${LIB_DIR}', | 2771 LIBPATH=['${LIB_DIR}', |
| 2769 jail + '/sysroot/usr/lib'] | 2772 jail + '/sysroot/usr/lib'] |
| 2770 ) | 2773 ) |
| 2771 | 2774 |
| 2772 env.Append(LIBS=['rt', 'dl', 'pthread'], | 2775 env.Append(LIBS=['rt', 'dl', 'pthread'], |
| (...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4034 nacl_env.ValidateSdk() | 4037 nacl_env.ValidateSdk() |
| 4035 | 4038 |
| 4036 if BROKEN_TEST_COUNT > 0: | 4039 if BROKEN_TEST_COUNT > 0: |
| 4037 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 4040 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
| 4038 if GetOption('brief_comstr'): | 4041 if GetOption('brief_comstr'): |
| 4039 msg += " Add --verbose to the command line for more information." | 4042 msg += " Add --verbose to the command line for more information." |
| 4040 print msg | 4043 print msg |
| 4041 | 4044 |
| 4042 # separate warnings from actual build output | 4045 # separate warnings from actual build output |
| 4043 Banner('B U I L D - O U T P U T:') | 4046 Banner('B U I L D - O U T P U T:') |
| OLD | NEW |