Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: BUILD.gn

Issue 1037193003: [GN] Use correct toolchain for x64 target on Android (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Use correct toolchain Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 0af482b2c9ea711566acda9b9c941836f82d7cca..2e93c15a3c80a2d9ae5cf2ff4df6bd8f862d5e55 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -32,9 +32,14 @@ v8_toolset_for_d8 = "host"
# TODO(GYP): For now we only support 32-bit little-endian target builds from an
# x64 Linux host. Eventually we need to support all of the host/target
# configurations v8 runs on.
-if (host_cpu == "x64" && host_os == "linux" &&
- (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86")) {
- snapshot_toolchain = "//build/toolchain/linux:clang_x86"
+if (host_cpu == "x64" && host_os == "linux") {
+ if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
+ snapshot_toolchain = "//build/toolchain/linux:clang_x86"
+ } else if (target_cpu == "x64") {
+ snapshot_toolchain = "//build/toolchain/linux:clang_x64"
+ } else {
+ assert(false, "Need environment for this arch")
+ }
} else {
snapshot_toolchain = default_toolchain
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698