| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2013 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 """Recipes for PNaCl target libs.""" | 6 """Recipes for PNaCl target libs.""" |
| 7 | 7 |
| 8 import fnmatch | 8 import fnmatch |
| 9 import os | 9 import os |
| 10 import sys | 10 import sys |
| 11 | 11 |
| 12 sys.path.append(os.path.join(os.path.dirname(__file__), '..')) | 12 sys.path.append(os.path.join(os.path.dirname(__file__), '..')) |
| 13 import pynacl.gsd_storage | 13 import pynacl.gsd_storage |
| 14 import pynacl.platform | 14 import pynacl.platform |
| 15 | 15 |
| 16 import command | 16 import command |
| 17 import pnacl_commands | 17 import pnacl_commands |
| 18 | 18 |
| 19 from toolchain_build import NewlibLibcScript | 19 from toolchain_build import NewlibLibcScript |
| 20 | 20 |
| 21 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) | 21 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) |
| 22 NACL_DIR = os.path.dirname(SCRIPT_DIR) | 22 NACL_DIR = os.path.dirname(SCRIPT_DIR) |
| 23 | 23 |
| 24 CLANG_VER = '3.5.0' | 24 CLANG_VER = '3.6.0' |
| 25 | 25 |
| 26 # Return the path to a tool to build target libraries | 26 # Return the path to a tool to build target libraries |
| 27 # msys should be false if the path will be called directly rather than passed to | 27 # msys should be false if the path will be called directly rather than passed to |
| 28 # an msys or cygwin tool such as sh or make. | 28 # an msys or cygwin tool such as sh or make. |
| 29 def PnaclTool(toolname, arch='le32', msys=True): | 29 def PnaclTool(toolname, arch='le32', msys=True): |
| 30 if not msys and pynacl.platform.IsWindows(): | 30 if not msys and pynacl.platform.IsWindows(): |
| 31 ext = '.bat' | 31 ext = '.bat' |
| 32 else: | 32 else: |
| 33 ext = '' | 33 ext = '' |
| 34 if IsBCArch(arch): | 34 if IsBCArch(arch): |
| (...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 'includedir=' +os.path.join('%(output)s', | 777 'includedir=' +os.path.join('%(output)s', |
| 778 TripleFromArch(MultilibArch(arch)), | 778 TripleFromArch(MultilibArch(arch)), |
| 779 'include'), | 779 'include'), |
| 780 'libdir=' + os.path.join('%(output)s', MultilibLibDir(arch)), | 780 'libdir=' + os.path.join('%(output)s', MultilibLibDir(arch)), |
| 781 'install'] + scons_flags, | 781 'install'] + scons_flags, |
| 782 cwd=NACL_DIR), | 782 cwd=NACL_DIR), |
| 783 ], | 783 ], |
| 784 } | 784 } |
| 785 } | 785 } |
| 786 return libs | 786 return libs |
| OLD | NEW |