Subzero: Add a proper default for --pnacl-bin-path .

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 .

Subzero: Add a proper default for --pnacl-bin-path .
79fe490f · Jim Stichnoth · d3f94f7e · 79fe490f
Commit 79fe490f authored Dec 10, 2015 by Jim Stichnoth
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

run-pnacl-sz.py pydir/run-pnacl-sz.py +5 -2

No files found.
--- a/pydir/run-pnacl-sz.py
+++ b/pydir/run-pnacl-sz.py
@@ -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,