Commit 94d731c1 authored by Nico Weber's avatar Nico Weber

win: Rename clang_x64 to win_clang_x64 in build/toolchain/win, step 3/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=pastarmovj,wfh,dschuff

Bug: 748501
Change-Id: Ifad35c6d2d0c29404637421a36a2a6bfeaa113c5
Reviewed-on: https://chromium-review.googlesource.com/585151Reviewed-by: 's avatarScott Graham <scottmg@chromium.org>
Reviewed-by: 's avatarWill Harris <wfh@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#489403}
parent e26c0e82
......@@ -739,7 +739,7 @@ if (is_win) {
if (target_cpu == "x86") {
if (is_clang) {
deps += [ "//courgette(//build/toolchain/win:clang_x64)" ]
deps += [ "//courgette(//build/toolchain/win:win_clang_x64)" ]
} else {
deps += [ "//courgette(//build/toolchain/win:x64)" ]
}
......
......@@ -244,7 +244,7 @@ deps = {
Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248
'src/third_party/libyuv':
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + 'd8136924bd0bef0cf39ef379d03196950ce58418', # from r1662
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '58d3392ad3ffec144c1639e2370e4f30ce046ed9',
'src/third_party/smhasher/src':
Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f',
......
......@@ -208,7 +208,7 @@ if (host_toolchain == "") {
# On Windows always use the target CPU for host builds. On the
# configurations we support this will always work and it saves build steps.
if (is_clang) {
host_toolchain = "//build/toolchain/win:clang_$target_cpu"
host_toolchain = "//build/toolchain/win:win_clang_$target_cpu"
} else {
host_toolchain = "//build/toolchain/win:$target_cpu"
}
......@@ -247,7 +247,7 @@ if (target_os == "android") {
# On Windows we use the same toolchain for host and target by default.
assert(target_os == host_os, "Win cross-compiles only work on win hosts.")
if (is_clang) {
_default_toolchain = "//build/toolchain/win:clang_$target_cpu"
_default_toolchain = "//build/toolchain/win:win_clang_$target_cpu"
} else {
_default_toolchain = "//build/toolchain/win:$target_cpu"
}
......
......@@ -356,7 +356,7 @@ if (target_cpu == "x86") {
}
}
msvc_toolchain("clang_x86") {
msvc_toolchain("win_clang_x86") {
environment = "environment.x86"
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
cl = "${goma_prefix}$prefix/${clang_cl}"
......@@ -393,7 +393,7 @@ template("win_x64_toolchains") {
}
}
msvc_toolchain("clang_" + target_name) {
msvc_toolchain("win_clang_" + target_name) {
environment = "environment.x64"
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
cl = "${goma_prefix}$prefix/${clang_cl}"
......
......@@ -4,4 +4,4 @@
# The name of the 64-bit win clang toolchain.
# TODO(thakis): Remove this again soon, https://crbug.com/748501
win_clang_x64_toolchain = "//build/toolchain/win:clang_x64"
win_clang_x64_toolchain = "//build/toolchain/win:win_clang_x64"
......@@ -15,7 +15,7 @@ group("cloud_print") {
# 64-bit systems.
if (target_cpu == "x86" && current_cpu == "x86") {
if (is_clang) {
win64 = "//build/toolchain/win:clang_x64"
win64 = "//build/toolchain/win:win_clang_x64"
} else {
win64 = "//build/toolchain/win:x64"
}
......
......@@ -62,7 +62,7 @@ if (current_cpu == "x64") {
# directory.
copy("copy_gcp_portmon_dll") {
if (is_clang) {
gcp_portmon64_toolchain = "//build/toolchain/win:clang_x64"
gcp_portmon64_toolchain = "//build/toolchain/win:win_clang_x64"
} else {
gcp_portmon64_toolchain = "//build/toolchain/win:x64"
}
......
......@@ -62,7 +62,7 @@ if (current_cpu == "x86") {
# NOTE: This must match what //build/config/BUILDCONFIG.gn uses
# as default toolchain for the corresponding x64 build.
if (is_clang) {
x64_toolchain = "//build/toolchain/win:clang_nacl_win64"
x64_toolchain = "//build/toolchain/win:win_clang_nacl_win64"
} else {
x64_toolchain = "//build/toolchain/win:nacl_win64"
}
......
......@@ -137,7 +137,7 @@ if (!is_ios) {
# directory.
copy("copy_courgette_binaries") {
if (is_clang) {
courgette64_toolchain = "//build/toolchain/win:clang_x64"
courgette64_toolchain = "//build/toolchain/win:win_clang_x64"
} else {
courgette64_toolchain = "//build/toolchain/win:x64"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment