Skip to content

Commit 18a1df7

Browse files
authored
Bump rules_foreign_cc for Bazel 9 fixes (#48071)
Depends on #48082. ### Motivation Moving the unreleased tip of main allows to address Bazel 9 related issues instead of patching locally: - bazel-contrib/rules_foreign_cc#1493 - bazel-contrib/rules_foreign_cc#1492 (`CcInfo` and other `Cc*` symbols) Other notable commits since: - bazel-contrib/rules_foreign_cc#1483 - bazel-contrib/rules_foreign_cc#1490 - bazel-contrib/rules_foreign_cc#1496 ### Additional Notes Patches 0002 (bazel-contrib/rules_foreign_cc#1452) and 0003 (bazel-contrib/rules_foreign_cc#1491) are still carried locally as neither has landed upstream yet (but we're working on it). Co-authored-by: regis.desgroppes <regis.desgroppes@datadoghq.com>
1 parent 604e5e9 commit 18a1df7

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

MODULE.bazel.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compliance/package_licenses.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def package_licenses(name = None, src = None):
6969
# Windows build; offers_dir is therefore always empty there. rules_python 1.9.0 makes `bazel run` copy
7070
# runfiles to a fresh temp dir and skips empty dirs, causing pkg_install to fail with FileNotFoundError
7171
# (Linux/macOS use symlinks so empty TreeArtifacts are fine); remove this select when Windows does.
72-
"@platforms//os:windows": [], #TODO(agent-build): remove `select` when Windows deps use ship_source_offer
72+
"@platforms//os:windows": [], #TODO(ABLD-351): deal with products that don't have source offers
7373
"//conditions:default": [":%s_offer_dir_stripped_" % name],
7474
}),
7575
visibility = ["//visibility:public"],

deps/repos.MODULE.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,20 @@ http_archive(
7373
)
7474

7575
# Defines a "rules_foreign_cc" target to build openssl
76-
# Pinned to main commit e4068330a799ba6090d8247cf34d470f722b32c4 to get:
76+
# Pinned to main commit 2373ac51627f05029b0068884c93fa82a11df400 to get:
7777
# - bazel-contrib/rules_foreign_cc#1451: out_data_dirs in output groups
7878
# - 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).
79+
# - bazel-contrib/rules_foreign_cc#1493: load CcSharedLibraryInfo from rules_cc (Bazel 9)
80+
# - bazel-contrib/rules_foreign_cc#1492: bump bazel_skylib_gazelle_plugin to 1.9.0 (Bazel 9)
8181
bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
8282
git_override(
8383
module_name = "rules_foreign_cc",
84-
commit = "e4068330a799ba6090d8247cf34d470f722b32c4",
84+
commit = "2373ac51627f05029b0068884c93fa82a11df400",
8585
patch_strip = 1,
8686
patches = [
87+
# https://github.com/bazel-contrib/rules_foreign_cc/pull/1452
8788
"//bazel/patches:rules_foreign_cc/0002-configure_make-provide-DY-LD_LIBRARY_PATH-based-on-t.patch",
89+
# https://github.com/bazel-contrib/rules_foreign_cc/pull/1491
8890
"//bazel/patches:rules_foreign_cc/0003-pass-j-flag-directly-on-make-command-line.patch",
8991
],
9092
remote = "https://github.com/bazel-contrib/rules_foreign_cc",

0 commit comments

Comments
 (0)