Subzero: Change pnacl_newlib ==> pnacl_newlib_raw in scripts.
BUG= none
R=jvoung@chromium.org, kschimpf@google.com
Review URL: https://codereview.chromium.org/1162903003
diff --git a/pydir/build-pnacl-ir.py b/pydir/build-pnacl-ir.py
index 96b4741..2ced17a 100755
--- a/pydir/build-pnacl-ir.py
+++ b/pydir/build-pnacl-ir.py
@@ -20,7 +20,7 @@
nacl_root = FindBaseNaCl()
# Prepend bin to $PATH.
os.environ['PATH'] = (
- nacl_root + '/toolchain/linux_x86/pnacl_newlib/bin' + os.pathsep +
+ nacl_root + '/toolchain/linux_x86/pnacl_newlib_raw/bin' + os.pathsep +
os.pathsep + os.environ['PATH'])
try:
diff --git a/pydir/crosstest.py b/pydir/crosstest.py
index d69647f..0441186 100755
--- a/pydir/crosstest.py
+++ b/pydir/crosstest.py
@@ -72,7 +72,7 @@
args = argparser.parse_args()
nacl_root = FindBaseNaCl()
- bindir = ('{root}/toolchain/linux_x86/pnacl_newlib/bin'
+ bindir = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/bin'
.format(root=nacl_root))
triple = arch_map[args.target] + ('-nacl' if args.sandbox else '')
mypath = os.path.abspath(os.path.dirname(sys.argv[0]))
diff --git a/pydir/szbuild.py b/pydir/szbuild.py
index d717c5f..c962d4c 100755
--- a/pydir/szbuild.py
+++ b/pydir/szbuild.py
@@ -131,7 +131,7 @@
to these tools, copy them this way:
cd native_client
toolchain_build/toolchain_build_pnacl.py llvm_x86_64_linux \\
- --install=toolchain/linux_x86/pnacl_newlib
+ --install=toolchain/linux_x86/pnacl_newlib_raw
"""
argparser = argparse.ArgumentParser(
description=' ' + main.__doc__,
@@ -153,7 +153,7 @@
nacl_root = FindBaseNaCl()
path_addition = (
- '{root}/toolchain/linux_x86/pnacl_newlib/bin'
+ '{root}/toolchain/linux_x86/pnacl_newlib_raw/bin'
).format(root=nacl_root)
os.environ['PATH'] = (
'{dir}{sep}{path}'
@@ -286,7 +286,7 @@
'{root}/../third_party/llvm-build/Release+Asserts/bin/clang'
).format(root=nacl_root)
if args.sandbox:
- linklib = ('{root}/toolchain/linux_x86/pnacl_newlib/translator/' +
+ linklib = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
'x86-32/lib').format(root=nacl_root)
shellcmd((
'{gold} -nostdlib --no-fix-cortex-a8 --eh-frame-hdr -z text ' +
@@ -307,8 +307,9 @@
'{ld} -m32 {partial} -o {exe} ' +
# Keep the rest of this command line (except szrt_native_x8632.o) in
# sync with RunHostLD() in pnacl-translate.py.
- '{root}/toolchain/linux_x86/pnacl_newlib/translator/x86-32-linux/' +
- 'lib/{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
+ '{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
+ 'x86-32-linux/lib/' +
+ '{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
'{root}/toolchain_build/src/subzero/build/runtime/' +
'szrt_native_x8632.o -lpthread -lrt ' +
'-Wl,--defsym=__Sz_AbsoluteZero=0'
