35c3a7e130
* build: make torque patch more specific the v8_generator_toolchain should only be overriden if the snapshot toolchain is a native arm or arm64 toolchain * Only test native mksnapshot on arm64 * Put environment variable in container
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Fri, 4 Jan 2019 15:50:24 +0530
|
|
Subject: build-torque-with-x64-toolchain-on-arm.patch
|
|
|
|
torque binary has to be run during the build.
|
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
|
index 9251b1cab957249be15e05beeabd9f20c841c348..465247a682cc1012d77c28c731fe1553565f128f 100644
|
|
--- a/BUILD.gn
|
|
+++ b/BUILD.gn
|
|
@@ -184,7 +184,9 @@ declare_args() {
|
|
|
|
v8_generator_toolchain = v8_snapshot_toolchain
|
|
if (host_cpu == "x64" &&
|
|
- (v8_current_cpu == "mips" || v8_current_cpu == "mips64")) {
|
|
+ (v8_current_cpu == "mips" || v8_current_cpu == "mips64" ||
|
|
+ v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm" ||
|
|
+ v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm64")) {
|
|
v8_generator_toolchain = "//build/toolchain/linux:clang_x64"
|
|
}
|
|
|
|
@@ -3412,7 +3414,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
|
|
}
|
|
}
|
|
|
|
-if (current_toolchain == v8_snapshot_toolchain) {
|
|
+if (current_toolchain == v8_generator_toolchain) {
|
|
v8_executable("torque") {
|
|
visibility = [ ":*" ] # Only targets in this file can depend on this.
|
|
|