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 glob | 7 import glob |
8 import os | 8 import os |
9 import platform | 9 import platform |
10 import shutil | 10 import shutil |
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1176 | 1176 |
1177 trusted_env = env['TRUSTED_ENV'] | 1177 trusted_env = env['TRUSTED_ENV'] |
1178 return trusted_env.File('${STAGING_DIR}/${PROGPREFIX}sel_ldr${PROGSUFFIX}') | 1178 return trusted_env.File('${STAGING_DIR}/${PROGPREFIX}sel_ldr${PROGSUFFIX}') |
1179 | 1179 |
1180 pre_base_env.AddMethod(GetSelLdr) | 1180 pre_base_env.AddMethod(GetSelLdr) |
1181 | 1181 |
1182 def GetBootstrap(env): | 1182 def GetBootstrap(env): |
1183 if 'TRUSTED_ENV' in env: | 1183 if 'TRUSTED_ENV' in env: |
1184 trusted_env = env['TRUSTED_ENV'] | 1184 trusted_env = env['TRUSTED_ENV'] |
1185 if trusted_env.Bit('linux'): | 1185 if trusted_env.Bit('linux'): |
| 1186 template_digits = 'X' * 16 |
1186 return (trusted_env.File('${STAGING_DIR}/nacl_helper_bootstrap'), | 1187 return (trusted_env.File('${STAGING_DIR}/nacl_helper_bootstrap'), |
1187 ['--r_debug=0xXXXXXXXXXXXXXXXX', '--reserved_at_zero=0xXXXXXXXX']) | 1188 ['--r_debug=0x' + template_digits, |
| 1189 '--reserved_at_zero=0x' + template_digits]) |
1188 return None, None | 1190 return None, None |
1189 | 1191 |
1190 pre_base_env.AddMethod(GetBootstrap) | 1192 pre_base_env.AddMethod(GetBootstrap) |
1191 | 1193 |
1192 def AddBootstrap(env, executable, args): | 1194 def AddBootstrap(env, executable, args): |
1193 bootstrap, bootstrap_args = env.GetBootstrap() | 1195 bootstrap, bootstrap_args = env.GetBootstrap() |
1194 if bootstrap is None: | 1196 if bootstrap is None: |
1195 return [executable] + args | 1197 return [executable] + args |
1196 else: | 1198 else: |
1197 return [bootstrap, executable] + bootstrap_args + args | 1199 return [bootstrap, executable] + bootstrap_args + args |
(...skipping 2815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4013 nacl_env.ValidateSdk() | 4015 nacl_env.ValidateSdk() |
4014 | 4016 |
4015 if BROKEN_TEST_COUNT > 0: | 4017 if BROKEN_TEST_COUNT > 0: |
4016 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 4018 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
4017 if GetOption('brief_comstr'): | 4019 if GetOption('brief_comstr'): |
4018 msg += " Add --verbose to the command line for more information." | 4020 msg += " Add --verbose to the command line for more information." |
4019 print msg | 4021 print msg |
4020 | 4022 |
4021 # separate warnings from actual build output | 4023 # separate warnings from actual build output |
4022 Banner('B U I L D - O U T P U T:') | 4024 Banner('B U I L D - O U T P U T:') |
OLD | NEW |