From db45c4850cda4a2792c6fc33f54218a0927a1361 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 13 Dec 2021 10:41:28 -0800 Subject: [PATCH] bazel: change bazelisk for M1 support This uses a fat binary version of bazelisk to better support arm bazel Signed-off-by: Keith Smiley --- bazelw | 5 ++--- envoy | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bazelw b/bazelw index e9e44c76fd..bf6205aaf6 100755 --- a/bazelw +++ b/bazelw @@ -4,9 +4,8 @@ set -euo pipefail readonly bazelisk_version="1.10.1" if [[ $OSTYPE == darwin* ]]; then - # TODO: Support M1 once https://github.com/envoyproxy/envoy/issues/16482 - readonly bazel_platform="darwin-amd64" - readonly bazel_version_sha="e485bbf84532d02a60b0eb23c702610b5408df3a199087a4f2b5e0995bbf2d5a" + readonly bazel_platform="darwin" + readonly bazel_version_sha="d3014e478fe6ebbc290e6eccdcc154e93f894300b63d521ec8d22c2e24f32892" else readonly bazel_platform="linux-amd64" readonly bazel_version_sha="4cb534c52cdd47a6223d4596d530e7c9c785438ab3b0a49ff347e991c210b2cd" diff --git a/envoy b/envoy index b1219ef0de..7ee2fed6ef 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit b1219ef0decc22040d45fe8bf2fa86bd16ea4e3c +Subproject commit 7ee2fed6efa2bf8228b541ca1fce079a567e3b0c