diff options
| author | Nico Weber <thakis@chromium.org> | 2017-07-25 15:48:37 -0400 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2017-07-25 19:59:42 +0000 |
| commit | 56022ef77fab3ce5a7c8ee44bd095c22a94bff5b (patch) | |
| tree | 8335619859c65922e2d1422438dc551b043fdd2d /BUILD.gn | |
| parent | 58d3392ad3ffec144c1639e2370e4f30ce046ed9 (diff) | |
| download | libyuv-56022ef77fab3ce5a7c8ee44bd095c22a94bff5b.tar.gz | |
win: Rename clang_x64 to win_clang_x64 in build/toolchain/win, step 4/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)
Bug: 748501
Change-Id: I89fdf1503f1a57992a8336026d4c8d767685d53f
Reviewed-on: https://chromium-review.googlesource.com/585306
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -7,7 +7,6 @@ # 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() { @@ -48,7 +47,7 @@ group("libyuv") { if (is_win && target_cpu == "x64") { # Compile with clang in order to get inline assembly public_deps = [ - ":libyuv_internal($win_clang_x64_toolchain)", + ":libyuv_internal(//build/toolchain/win:win_clang_x64)", ] } else { public_deps = [ |