| 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 |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 }) | 584 }) |
| 585 return libs | 585 return libs |
| 586 | 586 |
| 587 def UnsandboxedIRT(arch): | 587 def UnsandboxedIRT(arch): |
| 588 libs = { | 588 libs = { |
| 589 Mangle('unsandboxed_irt', arch): { | 589 Mangle('unsandboxed_irt', arch): { |
| 590 'type': 'build', | 590 'type': 'build', |
| 591 'output_subdir': 'lib-' + arch, | 591 'output_subdir': 'lib-' + arch, |
| 592 # This lib #includes | 592 # This lib #includes |
| 593 # arbitrary stuff from native_client/src/{include,untrusted,trusted} | 593 # arbitrary stuff from native_client/src/{include,untrusted,trusted} |
| 594 'inputs': { 'support': os.path.join(NACL_DIR, 'pnacl', 'support'), | 594 'inputs': { 'support': os.path.join(NACL_DIR, 'src', 'nonsfi', 'irt'), |
| 595 'include': os.path.join(NACL_DIR, 'src'), }, | 595 'include': os.path.join(NACL_DIR, 'src'), }, |
| 596 'commands': [ | 596 'commands': [ |
| 597 # The NaCl headers insist on having a platform macro such as | 597 # The NaCl headers insist on having a platform macro such as |
| 598 # NACL_LINUX defined, but unsandboxed_irt.c does not itself use | 598 # NACL_LINUX defined, but unsandboxed_irt.c does not itself use |
| 599 # any of these macros, so defining NACL_LINUX here even on | 599 # any of these macros, so defining NACL_LINUX here even on |
| 600 # non-Linux systems is OK. | 600 # non-Linux systems is OK. |
| 601 # TODO(dschuff): this include path breaks the input encapsulation | 601 # TODO(dschuff): this include path breaks the input encapsulation |
| 602 # for build rules. | 602 # for build rules. |
| 603 command.Command([ | 603 command.Command([ |
| 604 'gcc', '-m32', '-O2', '-Wall', '-Werror', | 604 'gcc', '-m32', '-O2', '-Wall', '-Werror', |
| 605 '-I%(top_srcdir)s/..', '-DNACL_LINUX=1', | 605 '-I%(top_srcdir)s/..', '-DNACL_LINUX=1', |
| 606 '-c', command.path.join('%(support)s', 'unsandboxed_irt.c'), | 606 '-c', command.path.join('%(support)s', 'irt_interfaces.c'), |
| 607 '-o', command.path.join('%(output)s', 'unsandboxed_irt.o')]), | 607 '-o', command.path.join('%(output)s', 'unsandboxed_irt.o')]), |
| 608 ], | 608 ], |
| 609 }, | 609 }, |
| 610 } | 610 } |
| 611 return libs | 611 return libs |
| OLD | NEW |