Skip to content

Commit a9da998

Browse files
committed
Bump rules_foreign_cc to main, drop merged patch, bump bazel_lib
Switch rules_foreign_cc from single_version_override on 0.15.1 to a git_override on main (e4068330) to pick up three upstream fixes: - bazel-contrib/rules_foreign_cc#1451: out_data_dirs in output groups (our patch 0001 verbatim — drop it) - bazel-contrib/rules_foreign_cc#1465: resource_set integration, which lets Bazel's scheduler respect CPU/RAM budgets and avoids build action overcommitting - bazel-contrib/rules_foreign_cc#1470: forward -isystem flags to configure scripts Patch 0002 (LD_LIBRARY_PATH propagation) is kept locally as bazel-contrib/rules_foreign_cc#1452 is still open. bazel-contrib/rules_foreign_cc#1462 bumps bazel_lib to 3.2.0; follow up to 3.2.2 to get path-mapping compatibility with Bazel 9.
1 parent f9ca8e0 commit a9da998

4 files changed

Lines changed: 14 additions & 53 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ archive_override(
3939
urls = ["https://github.com/aiuto/supply-chain/archive/refs/tags/dd_test.tar.gz"],
4040
)
4141

42-
bazel_dep(name = "bazel_lib", version = "3.1.1")
42+
bazel_dep(name = "bazel_lib", version = "3.2.2")
4343
bazel_dep(name = "bazel_skylib", version = "1.9.0")
4444
bazel_dep(name = "gazelle", version = "0.47.0")
4545
bazel_dep(name = "libarchive", version = "3.8.1")

MODULE.bazel.lock

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/patches/rules_foreign_cc/0001-include-out_data_dirs-to-the-output-groups.patch

Lines changed: 0 additions & 42 deletions
This file was deleted.

deps/repos.MODULE.bazel

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,18 @@ http_archive(
7373
)
7474

7575
# Defines a "rules_foreign_cc" target to build openssl
76+
# Pinned to main commit e4068330a799ba6090d8247cf34d470f722b32c4 to get:
77+
# - bazel-contrib/rules_foreign_cc#1451: out_data_dirs in output groups
78+
# - bazel-contrib/rules_foreign_cc#1465: resource_set integration (fixes overcommitting)
79+
# - bazel-contrib/rules_foreign_cc#1470: -isystem forwarding to configure scripts
80+
# Patch 0002 is still carried locally (bazel-contrib/rules_foreign_cc#1452 not yet merged).
7681
bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
77-
single_version_override(
82+
git_override(
7883
module_name = "rules_foreign_cc",
84+
commit = "e4068330a799ba6090d8247cf34d470f722b32c4",
7985
patch_strip = 1,
80-
patches = [
81-
"//bazel/patches:rules_foreign_cc/0001-include-out_data_dirs-to-the-output-groups.patch",
82-
"//bazel/patches:rules_foreign_cc/0002-configure_make-provide-DY-LD_LIBRARY_PATH-based-on-t.patch",
83-
],
86+
patches = ["//bazel/patches:rules_foreign_cc/0002-configure_make-provide-DY-LD_LIBRARY_PATH-based-on-t.patch"],
87+
remote = "https://github.com/bazel-contrib/rules_foreign_cc",
8488
)
8589

8690
register_toolchains(

0 commit comments

Comments
 (0)