From bd8efdbe1b0e898c089bddcaef050c3034242e59 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Fri, 19 Nov 2021 16:47:33 -0800 Subject: [PATCH] bazel: improve rules_foreign_cc bootstrapping This allows rules_foreign_cc to build make, cmake, and ninja itself, so that it always has the same version across all developers. Previously this didn't work with Apple Silicon but that was fixed by https://github.com/bazelbuild/rules_foreign_cc/pull/814 Signed-off-by: Keith Smiley --- bazel/dependency_imports.bzl | 3 +-- bazel/repository_locations.bzl | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index b382e3fd02cd..dcce3957c6ec 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -14,8 +14,7 @@ load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolch GO_VERSION = "1.15.5" def envoy_dependency_imports(go_version = GO_VERSION): - # TODO: allow building of tools for easier onboarding - rules_foreign_cc_dependencies(register_default_tools = False, register_built_tools = False) + rules_foreign_cc_dependencies() go_rules_dependencies() go_register_toolchains(go_version) gazelle_dependencies() diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index b2ed497e3a18..dbf29e126778 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -677,11 +677,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Rules for using foreign build systems in Bazel", project_desc = "Rules for using foreign build systems in Bazel", project_url = "https://github.com/bazelbuild/rules_foreign_cc", - version = "6c0c2af3d599f4c23117a5e65e811ebab75bb151", - sha256 = "8a438371fa742bbbae8b6d995905280053098c5aac28cd434240cd75bc2415a5", + version = "7baefc1a8c12933ba473a670805efa49a47bbd8e", + sha256 = "74fa4f073202e602848c6a3ce3a213e05b01acd5799ad5eb69795996ac20d11e", strip_prefix = "rules_foreign_cc-{version}", urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/{version}.tar.gz"], - release_date = "2021-09-22", + release_date = "2021-11-19", use_category = ["build", "dataplane_core", "controlplane"], ), rules_python = dict(