From 90bc7fcd55fafa57ae09b0c6afe1dd9f177604da Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Fri, 29 Jul 2022 14:13:42 -0700 Subject: [PATCH] Fetch the ARM64-host clang on Mac and Linux ARM64. (flutter/engine#35003) Mac ARM64 continues to also fetch the X64-host toolchain because the GN files that need to updated live in another repository, so this cannot be done atomically. --- DEPS | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 4538b020a13..184d3ec75bf 100644 --- a/DEPS +++ b/DEPS @@ -606,21 +606,43 @@ deps = { 'packages': [ { 'package': 'fuchsia/third_party/clang/mac-amd64', - 'version': 'NyopqdQvXY11sckCZIz7FdXLgQZep1ssg1IYBX09ZPwC' + 'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855' } ], 'condition': 'host_os == "mac"', 'dep_type': 'cipd', }, + 'src/buildtools/mac-arm64/clang': { + 'packages': [ + { + 'package': 'fuchsia/third_party/clang/mac-arm64', + 'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855' + } + ], + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + 'dep_type': 'cipd', + }, + 'src/buildtools/linux-x64/clang': { 'packages': [ { 'package': 'fuchsia/third_party/clang/linux-amd64', - 'version': 'ad2NsyQv7Q0UnDFu6vxeKVumfP-AHmA-ju9u0YCZkwgC' + 'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855' } ], - 'condition': 'host_os == "linux"', + 'condition': 'host_os == "linux" and host_cpu == "x64"', + 'dep_type': 'cipd', + }, + + 'src/buildtools/linux-arm64/clang': { + 'packages': [ + { + 'package': 'fuchsia/third_party/clang/linux-amd64', + 'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855' + } + ], + 'condition': 'host_os == "linux" and host_cpu == "arm64"', 'dep_type': 'cipd', }, @@ -628,7 +650,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/third_party/clang/windows-amd64', - 'version': '4H1CWy95NO6tWA96OvQIMCA-s9tZfSMLa9RoghEuXqgC' + 'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855' } ], 'condition': 'download_windows_deps',