OSDN Git Service

Subzero: Add a proper default for --pnacl-bin-path .
authorJim Stichnoth <stichnot@chromium.org>
Thu, 10 Dec 2015 19:08:49 +0000 (11:08 -0800)
committerJim Stichnoth <stichnot@chromium.org>
Thu, 10 Dec 2015 19:08:49 +0000 (11:08 -0800)
Defining this argument as "required=False, default=None" means it's not really optional.  It's possible to provide a reasonable default like in e.g. szbuild.py.

BUG= none
R=jpp@chromium.org

Review URL: https://codereview.chromium.org/1511963002 .

pydir/run-pnacl-sz.py

index 8279772..b7434ad 100755 (executable)
@@ -8,7 +8,7 @@ import subprocess
 import sys
 import tempfile
 
-from utils import shellcmd
+from utils import FindBaseNaCl, shellcmd
 
 
 def TargetAssemblerFlags(target, sandboxed):
@@ -60,7 +60,10 @@ def main():
         '--pnacl-sz', required=False, default='./pnacl-sz', metavar='PNACL-SZ',
         help="Subzero translator 'pnacl-sz'")
     argparser.add_argument('--pnacl-bin-path', required=False,
-                           default=None, metavar='PNACL_BIN_PATH',
+                           default=(
+                             '{root}/toolchain/linux_x86/pnacl_newlib_raw/bin'
+                           ).format(root=FindBaseNaCl()),
+                           metavar='PNACL_BIN_PATH',
                            help='Path to LLVM & Binutils executables ' +
                                 '(e.g. for building PEXE files)')
     argparser.add_argument('--assemble', required=False,