Skip to content

Commit

Permalink
bazel: improve rules_foreign_cc bootstrapping
Browse files Browse the repository at this point in the history
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 bazel-contrib/rules_foreign_cc#814

Signed-off-by: Keith Smiley <[email protected]>
  • Loading branch information
keith committed Nov 29, 2021
1 parent 1eb1841 commit bd8efdb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions bazel/dependency_imports.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit bd8efdb

Please sign in to comment.