| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/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 # IMPORTANT NOTE: If you make local mods to this file, you must run: | 6 # IMPORTANT NOTE: If you make local mods to this file, you must run: |
| 7 # % pnacl/build.sh driver | 7 # % pnacl/build.sh driver |
| 8 # in order for them to take effect in the scons build. This command | 8 # in order for them to take effect in the scons build. This command |
| 9 # updates the copy in the toolchain/ tree. | 9 # updates the copy in the toolchain/ tree. |
| 10 | 10 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 'BASE_LIB' : '${BASE}/lib', | 43 'BASE_LIB' : '${BASE}/lib', |
| 44 'BASE_USR_ARCH' : '${BASE_USR_%BCLIB_ARCH%}', | 44 'BASE_USR_ARCH' : '${BASE_USR_%BCLIB_ARCH%}', |
| 45 'BASE_USR_X8632' : '${BASE}/usr-bc-x86-32', | 45 'BASE_USR_X8632' : '${BASE}/usr-bc-x86-32', |
| 46 'BASE_USR_X8664' : '${BASE}/usr-bc-x86-64', | 46 'BASE_USR_X8664' : '${BASE}/usr-bc-x86-64', |
| 47 'BASE_USR_ARM' : '${BASE}/usr-bc-arm', | 47 'BASE_USR_ARM' : '${BASE}/usr-bc-arm', |
| 48 'BASE_LIB_ARCH' : '${BASE_LIB_%BCLIB_ARCH%}', | 48 'BASE_LIB_ARCH' : '${BASE_LIB_%BCLIB_ARCH%}', |
| 49 'BASE_LIB_X8632' : '${BASE}/lib-bc-x86-32', | 49 'BASE_LIB_X8632' : '${BASE}/lib-bc-x86-32', |
| 50 'BASE_LIB_X8664' : '${BASE}/lib-bc-x86-64', | 50 'BASE_LIB_X8664' : '${BASE}/lib-bc-x86-64', |
| 51 'BASE_LIB_ARM' : '${BASE}/lib-bc-arm', | 51 'BASE_LIB_ARM' : '${BASE}/lib-bc-arm', |
| 52 | 52 |
| 53 'LIBS_NATIVE_ARCH' : '${LIBS_NATIVE_%ARCH%}', |
| 54 'LIBS_NATIVE_ARM' : '${BASE_LIB_NATIVE}arm', |
| 55 'LIBS_NATIVE_ARM_NONSFI' : '${BASE_LIB_NATIVE}arm-nonsfi', |
| 56 'LIBS_NATIVE_X8632' : '${BASE_LIB_NATIVE}x86-32', |
| 57 'LIBS_NATIVE_X8632_NONSFI' : '${BASE_LIB_NATIVE}x86-32-nonsfi', |
| 58 'LIBS_NATIVE_X8664' : '${BASE_LIB_NATIVE}x86-64', |
| 59 'LIBS_NATIVE_MIPS32' : '${BASE_LIB_NATIVE}mips32', |
| 60 |
| 53 'BASE_LLVM_BIN' : '${BASE_LLVM}/bin', | 61 'BASE_LLVM_BIN' : '${BASE_LLVM}/bin', |
| 54 'TRANSLATOR_BIN' : | 62 'TRANSLATOR_BIN' : |
| 55 '${BASE_TOOLCHAIN}/pnacl_translator/${STANDARD_ARCH}/bin', | 63 '${BASE_TOOLCHAIN}/pnacl_translator/${STANDARD_ARCH}/bin', |
| 56 | 64 |
| 57 # TODO(pdox): Unify this with ARCH. | 65 # TODO(pdox): Unify this with ARCH. |
| 58 'STANDARD_ARCH' : '${STANDARD_ARCH_%ARCH%}', | 66 'STANDARD_ARCH' : '${STANDARD_ARCH_%ARCH%}', |
| 59 'STANDARD_ARCH_X8632' : 'i686', | 67 'STANDARD_ARCH_X8632' : 'i686', |
| 60 'STANDARD_ARCH_X8664' : 'x86_64', | 68 'STANDARD_ARCH_X8664' : 'x86_64', |
| 61 'STANDARD_ARCH_ARM' : 'armv7', | 69 'STANDARD_ARCH_ARM' : 'armv7', |
| 62 'STANDARD_ARCH_MIPS32': 'mips32', | 70 'STANDARD_ARCH_MIPS32': 'mips32', |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 503 | 511 |
| 504 | 512 |
| 505 env = Environment() | 513 env = Environment() |
| 506 | 514 |
| 507 def override_env(meth_name, func): | 515 def override_env(meth_name, func): |
| 508 """Override a method in the global |env|, given the method name | 516 """Override a method in the global |env|, given the method name |
| 509 and the new function. | 517 and the new function. |
| 510 """ | 518 """ |
| 511 global env | 519 global env |
| 512 setattr(env, meth_name, types.MethodType(func, env, Environment)) | 520 setattr(env, meth_name, types.MethodType(func, env, Environment)) |
| OLD | NEW |