From fafcc0d717526d0fc4c2312e8d6fd22ce263030b Mon Sep 17 00:00:00 2001 From: "halton.huo" Date: Tue, 31 Mar 2015 18:44:22 -0700 Subject: [PATCH] [GN] Use correct toolchain for x64 target on Android This commit is to fix the linking error: ../../v8/src/base/platform/platform-posix.cc:418: error: undefined reference to '__android_log_vprint' Review URL: https://codereview.chromium.org/1037193003 Cr-Commit-Position: refs/heads/master@{#27559} --- BUILD.gn | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 6b102f37a1..34500fe01b 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 }