coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-08 09:47:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

win: Rename clang_x64 to win_clang_x64 in build/toolchain/win, step 2/5.

Browse Source 
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 <thakis@chromium.org>
Reviewed-by: Frank Barchard <fbarchard@google.com>
This commit is contained in:
Nico Weber 2017-07-25 12:25:14 -04:00
parent fba90197f7
commit 58d3392ad3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BUILD.gn
View File

@ -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 = [

4
DEPS
View File

@ -14,7 +14,7 @@ vars = {
deps = {
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + 'e3c0667f115674831e9eb2e91ecbec4545b049ab',
Var('chromium_git') + '/chromium/src/build' + '@' + '15b41f483525d2e036a529e12518e55d2e5182a8',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '5ad14542a6a74dd914f067b948c5d3e8d170396b',
'src/testing':
@ -32,7 +32,7 @@ deps = {
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a',
'src/tools':
Var('chromium_git') + '/chromium/src/tools' + '@' + '1397f0ed8bd7b907118588800f31382c1da33afc',
Var('chromium_git') + '/chromium/src/tools' + '@' + 'f79809d0346e8191983826dee15df3f2c71b1343',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':