From 2733c2693bb2a32d52140ddeaf9e26998d4f540a Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 16 Nov 2020 21:11:19 +0000 Subject: [PATCH] Stop setting mac_xcode_version in DEPS mac_xcode_version no longer has an effect and we have been requested to remove it. Also add updating the mac toolchain. Bug: chromium:1147839,tint:197 Change-Id: I120c1b4494154c701efcbe70063f35e4f1d373b2 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/33000 Reviewed-by: dan sinclair Reviewed-by: Ben Clayton Commit-Queue: Ryan Harrison Auto-Submit: Ryan Harrison --- DEPS | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 36db4e8278..2fa9ad975f 100644 --- a/DEPS +++ b/DEPS @@ -1,16 +1,8 @@ use_relative_paths = True gclient_gn_args_file = 'build/config/gclient_args.gni' -gclient_gn_args = [ - 'mac_xcode_version', -] vars = { - # This can be overridden, e.g. with custom_vars, to download a nonstandard - # Xcode version in build/mac_toolchain.py - # instead of downloading the prebuilt pinned revision. - 'mac_xcode_version': 'default', - 'chromium_git': 'https://chromium.googlesource.com', 'github': '/external/github.com', @@ -110,6 +102,13 @@ hooks = [ 'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py', '--arch=x64'], }, + { + # Update the Mac toolchain if necessary. + 'name': 'mac_toolchain', + 'pattern': '.', + 'condition': 'checkout_mac', + 'action': ['python', 'build/mac_toolchain.py'], + }, { # Update the Windows toolchain if necessary. Must run before 'clang' below. 'name': 'win_toolchain',