From 58d3392ad3ffec144c1639e2370e4f30ce046ed9 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 25 Jul 2017 12:25:14 -0400 Subject: win: Rename clang_x64 to win_clang_x64 in build/toolchain/win, step 2/5. In cross builds of chrome/win, the host and target toolchains currently have the same name. To fix this, rename clang_x64 to win_clang_x64. Because the toolchain name is also referenced in libyuv, this requires a five-sided change: 1. Introduce variable containing the toolchain name in src.git 2* Change libyuv to refer to the variable 3. Rename toolchain in src.git (including in the newly introduced var) 4. Let libyuv refer to the new name directly 5. Remove variable again (See also https://codereview.chromium.org/2463143002) TBR=fbarchard Bug: 748501 Change-Id: Id8398ab5c4615c7c33dfa5ec793fdc8c0a717e57 Reviewed-on: https://chromium-review.googlesource.com/585307 Reviewed-by: Nico Weber Reviewed-by: Frank Barchard --- BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index ecc51f9a..fa4a5f3e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -7,6 +7,7 @@ # be found in the AUTHORS file in the root of the source tree. import("libyuv.gni") +import("//build/toolchain/win/clang_name.gni") import("//testing/test.gni") declare_args() { @@ -47,7 +48,7 @@ group("libyuv") { if (is_win && target_cpu == "x64") { # Compile with clang in order to get inline assembly public_deps = [ - ":libyuv_internal(//build/toolchain/win:clang_x64)", + ":libyuv_internal($win_clang_x64_toolchain)", ] } else { public_deps = [ -- cgit v1.2.3