Commit 38ebe528 authored by Michael Achenbach's avatar Michael Achenbach

Torque: Fix mips compile error

Change-Id: I6a97005943b36c0dab70fe8f18bbfcab443c3e03
Reviewed-on: https://chromium-review.googlesource.com/1013566
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: 's avatarDaniel Clifford <danno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52619}
parent a3353da8
...@@ -839,8 +839,17 @@ action("run_torque") { ...@@ -839,8 +839,17 @@ action("run_torque") {
"tools/gcmole/:*", "tools/gcmole/:*",
] ]
# We reuse the snapshot toolchain for building torque to not build v8_libbase
# on the host more than once. On mips with big endian, the snapshot toolchain
# is the target toolchain and, hence, can't be used.
v8_torque_toolchain = v8_snapshot_toolchain
if (host_cpu == "x64" &&
(v8_current_cpu == "mips" || v8_current_cpu == "mips64")) {
v8_torque_toolchain = "//build/toolchain/linux:clang_x64"
}
deps = [ deps = [
":torque($v8_snapshot_toolchain)", ":torque($v8_torque_toolchain)",
] ]
script = "tools/run.py" script = "tools/run.py"
...@@ -859,7 +868,7 @@ action("run_torque") { ...@@ -859,7 +868,7 @@ action("run_torque") {
] ]
args = [ args = [
"./" + rebase_path(get_label_info(":torque($v8_snapshot_toolchain)", "./" + rebase_path(get_label_info(":torque($v8_torque_toolchain)",
"root_out_dir") + "/torque", "root_out_dir") + "/torque",
root_build_dir), root_build_dir),
"-o", "-o",
......
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