Commit 4c127ba7 by Jan Voung

Adjust paths for host_x86_32/bin -> bin and for switch to 64-bit.

See: https://codereview.chromium.org/580983002 BUG=none R=kschimpf@google.com, stichnot@chromium.org Review URL: https://codereview.chromium.org/581293003
parent 8df26f3e
......@@ -17,18 +17,18 @@ LLVM_SRC_PATH ?= ../llvm
# process. It should contain the tools like opt, llc and clang. The default
# reflects a debug build with autotools (configure & make).
LLVM_BIN_PATH ?= $(shell readlink -e \
../../out/llvm_i686_linux_work/Release+Asserts/bin)
../../out/llvm_x86_64_linux_work/Release+Asserts/bin)
# LIBCXX_INSTALL_PATH is the directory where libc++ is located. It should
# contain header files and corresponding libraries
LIBCXX_INSTALL_PATH ?= $(shell readlink -e \
../../../toolchain/linux_x86/pnacl_newlib/host_x86_32)
../../../toolchain/linux_x86/pnacl_newlib)
# CLANG_PATH is the location of the clang compiler to use.
CLANG_PATH ?= $(shell readlink -e \
../../../../third_party/llvm-build/Release+Asserts/bin)
HOST_ARCH ?= x86
HOST_ARCH ?= x86_64
ifeq ($(HOST_ARCH),x86_64)
HOST_FLAGS = -m64 -stdlib=libc++
else
......
......@@ -68,9 +68,9 @@ if __name__ == '__main__':
args = argparser.parse_args()
nacl_root = FindBaseNaCl()
# Prepend host_x86_32/bin to $PATH.
# Prepend PNaCl bin to $PATH.
os.environ['PATH'] = nacl_root + \
'/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin' + \
'/toolchain/linux_x86/pnacl_newlib/bin' + \
os.pathsep + os.environ['PATH']
objs = []
......
......@@ -125,7 +125,7 @@ def main():
be run. These extra paths are within the native_client tree.
When changes are made to these tools, copy them this way:
cd native_client
toolchain_build/toolchain_build_pnacl.py llvm_i686_linux \\
toolchain_build/toolchain_build_pnacl.py llvm_x86_64_linux \\
--install=toolchain/linux_x86/pnacl_newlib
"""
argparser = argparse.ArgumentParser(
......@@ -149,7 +149,6 @@ def ProcessPexe(args, pexe, exe):
nacl_root = FindBaseNaCl()
os.environ['PATH'] = (
'{root}/toolchain/linux_x86/pnacl_newlib/bin{sep}' +
'{root}/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin{sep}' +
'{path}'
).format(root=nacl_root, sep=os.pathsep, path=os.environ['PATH'])
obj_llc = pexe_base + '.llc.o'
......@@ -167,7 +166,7 @@ def ProcessPexe(args, pexe, exe):
'{root}/toolchain_build/src/subzero/llvm2ice'
).format(root=nacl_root)
llcbin = (
'{root}/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin/llc'
'{root}/toolchain/linux_x86/pnacl_newlib/bin/llc'
).format(root=nacl_root)
opt_level = args.optlevel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment