Skip to content

Fix rust_bindgen's clang include path and dep wiring #4218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krasimirgg merged 2 commits into from
Aug 19, 2026
+30 −3
Merged

Fix rust_bindgen's clang include path and dep wiring #4218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
977bf2f
Fix rust_bindgen's clang include path and dep wiring
AustinSchuh Aug 10, 2026
d1f9c54
Merge branch 'main' into bindgen-idirafter-and-link-deps
krasimirgg Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions extensions/bindgen/private/bindgen.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ def rust_bindgen_library(
):
if shared in kwargs:
bindgen_kwargs.update({shared: kwargs[shared]})
merge_cc_lib_objects_into_rlib = True
if "merge_cc_lib_objects_into_rlib" in kwargs:
bindgen_kwargs.update({"merge_cc_lib_objects_into_rlib": kwargs["merge_cc_lib_objects_into_rlib"]})
kwargs.pop("merge_cc_lib_objects_into_rlib")
merge_cc_lib_objects_into_rlib = kwargs.pop("merge_cc_lib_objects_into_rlib")
bindgen_kwargs.update({"merge_cc_lib_objects_into_rlib": merge_cc_lib_objects_into_rlib})

rust_bindgen(
name = name + "__bindgen",
Expand All @@ -102,6 +103,10 @@ def rust_bindgen_library(
if "deps" in kwargs:
kwargs.pop("deps")

link_deps = kwargs.get("link_deps") or []
if "link_deps" in kwargs:
kwargs.pop("link_deps")

if wrap_static_fns:
native.filegroup(
name = name + "__bindgen_c_thunks",
Expand All @@ -115,10 +120,26 @@ def rust_bindgen_library(
deps = [cc_lib],
)

# With `merge_cc_lib_objects_into_rlib` the bindgen target links `cc_lib`
# into the rlib via a `BuildInfo` provider carrying `-lstatic=`/`-Lnative=`
# flags, and deliberately withholds `cc_lib`'s libraries from its `CcInfo`
# so nothing downstream links them twice. `link_deps` keeps only `CcInfo`,
# so routing it there would drop the objects entirely; it has to stay in
# `deps`. Without the flag it provides a plain `CcInfo` and belongs in
# `link_deps`, as does the `cc_library` of static fn thunks.
if merge_cc_lib_objects_into_rlib:
deps = deps + [":" + name + "__bindgen"]
else:
link_deps = link_deps + [":" + name + "__bindgen"]

if wrap_static_fns:
link_deps = link_deps + [":" + name + "__bindgen_c_thunks_library"]

rust_library(
name = name,
srcs = [name + "__bindgen.rs"],
deps = deps + [":" + name + "__bindgen"] + ([":" + name + "__bindgen_c_thunks_library"] if wrap_static_fns else []),
deps = deps,
link_deps = link_deps,
tags = tags,
**kwargs
)
Expand Down Expand Up @@ -288,6 +309,11 @@ def _rust_bindgen_impl(ctx):
# Ignore unknown warning options from the CC toolchain (e.g., GCC-specific flags)
args.add("-Wno-unknown-warning-option")

# The CC toolchain's flags are written for its own language mode. bindgen
# parses headers as C, where flags like -nostdinc++ do nothing, so clang
# warns about each one and buries the real output.
args.add("-Wno-unused-command-line-argument")

resource_dir = _get_resource_dir(cc_toolchain)
if resource_dir:
args.add("-resource-dir=%s" % resource_dir)
Expand Down Expand Up @@ -321,6 +347,7 @@ def _rust_bindgen_impl(ctx):
param_flags_known_to_clang = (
"-I",
"-iquote",
"-idirafter",
"-isystem",
"--sysroot",
"--gcc-toolchain",
Expand Down
Loading