| 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 3826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3837 def PnaclSetEmulatorForSandboxedTranslator(selected_envs): | 3837 def PnaclSetEmulatorForSandboxedTranslator(selected_envs): |
| 3838 # Slip in emulator flags if necessary, for the sandboxed pnacl translator | 3838 # Slip in emulator flags if necessary, for the sandboxed pnacl translator |
| 3839 # on ARM, once emulator is actually known (vs in naclsdk.py, where it | 3839 # on ARM, once emulator is actually known (vs in naclsdk.py, where it |
| 3840 # is not yet known). | 3840 # is not yet known). |
| 3841 for env in selected_envs: | 3841 for env in selected_envs: |
| 3842 if (env.Bit('bitcode') | 3842 if (env.Bit('bitcode') |
| 3843 and env.Bit('use_sandboxed_translator') | 3843 and env.Bit('use_sandboxed_translator') |
| 3844 and env.UsingEmulator()): | 3844 and env.UsingEmulator()): |
| 3845 # This must modify the LINK command itself, since LINKFLAGS may | 3845 # This must modify the LINK command itself, since LINKFLAGS may |
| 3846 # be filtered (e.g., in barebones tests). | 3846 # be filtered (e.g., in barebones tests). |
| 3847 env['LINK'] = env.get('LINK') + ' --pnacl-use-emulator' | 3847 env.Append(LINK=' --pnacl-use-emulator') |
| 3848 env.Append(TRANSLATE=' --pnacl-use-emulator') |
| 3848 | 3849 |
| 3849 # ---------------------------------------------------------- | 3850 # ---------------------------------------------------------- |
| 3850 # Blank out defaults. | 3851 # Blank out defaults. |
| 3851 Default(None) | 3852 Default(None) |
| 3852 | 3853 |
| 3853 # Apply optional supplement if present in the directory tree. | 3854 # Apply optional supplement if present in the directory tree. |
| 3854 if os.path.exists(pre_base_env.subst('$MAIN_DIR/supplement/supplement.scons')): | 3855 if os.path.exists(pre_base_env.subst('$MAIN_DIR/supplement/supplement.scons')): |
| 3855 SConscript('supplement/supplement.scons', exports=['environment_list']) | 3856 SConscript('supplement/supplement.scons', exports=['environment_list']) |
| 3856 | 3857 |
| 3857 # print sytem info (optionally) | 3858 # print sytem info (optionally) |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3896 nacl_env.ValidateSdk() | 3897 nacl_env.ValidateSdk() |
| 3897 | 3898 |
| 3898 if BROKEN_TEST_COUNT > 0: | 3899 if BROKEN_TEST_COUNT > 0: |
| 3899 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 3900 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
| 3900 if GetOption('brief_comstr'): | 3901 if GetOption('brief_comstr'): |
| 3901 msg += " Add --verbose to the command line for more information." | 3902 msg += " Add --verbose to the command line for more information." |
| 3902 print msg | 3903 print msg |
| 3903 | 3904 |
| 3904 # separate warnings from actual build output | 3905 # separate warnings from actual build output |
| 3905 Banner('B U I L D - O U T P U T:') | 3906 Banner('B U I L D - O U T P U T:') |
| OLD | NEW |