Skip to content

Adjust env for bindgen compilation. #916

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
illicitonion merged 5 commits into from
Aug 31, 2021
Merged

Adjust env for bindgen compilation. #916

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87e7bb9
Adjust env for bindgen compilation.
sayrer Aug 29, 2021
ecc65a8
Buildifier.
sayrer Aug 29, 2021
c43edc7
Fix visibility warning.
sayrer Aug 29, 2021
869f96b
More buildifier.
sayrer Aug 29, 2021
91558c3
Merge branch 'bazelbuild:main' into fix_bindgen_includes_and_env
sayrer Aug 31, 2021
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
13 changes: 12 additions & 1 deletion bindgen/bindgen.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
load("//rust:rust.bzl", "rust_library")

# buildifier: disable=bzl-visibility
load("//rust/private:utils.bzl", "find_toolchain", "get_preferred_artifact")
load("//rust/private:rustc.bzl", "get_linker_and_args")

# buildifier: disable=bzl-visibility
load("//rust/private:utils.bzl", "find_cc_toolchain", "find_toolchain", "get_preferred_artifact")

# TODO(hlopko): use the more robust logic from rustc.bzl also here, through a reasonable API.
def _get_libs_for_static_executable(dep):
Expand Down Expand Up @@ -126,6 +129,9 @@ def _rust_bindgen_impl(ctx):
"LIBCLANG_PATH": libclang_dir,
"RUST_BACKTRACE": "1",
}
cc_toolchain, feature_configuration = find_cc_toolchain(ctx)
_, _, linker_env = get_linker_and_args(ctx, ctx.attr, cc_toolchain, feature_configuration, None)
env.update(**linker_env)
Copy link
Copy Markdown
Collaborator

@illicitonion illicitonion Aug 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need any special handling in the case of clashes with things we explicitly set? e.g. should we be prepending/appending to the LD_LIBRARY_PATH rather than overwriting it?

Copy link
Copy Markdown
Contributor Author

@sayrer sayrer Aug 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's that issue, and whether the the system include directories from the cc_toolchain should be added. I'm inclined to leave it as I've written it, and adjust if people have problems with it, since this patch is clearly a step forward.

Copy link
Copy Markdown
Collaborator

@illicitonion illicitonion Aug 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, sounds reasonable - let's see how we go!


# Set the dynamic linker search path so that clang uses the libstdcxx from the toolchain.
# DYLD_LIBRARY_PATH is LD_LIBRARY_PATH on macOS.
Expand Down Expand Up @@ -188,6 +194,9 @@ rust_bindgen = rule(
doc = "The .h file to generate bindings for.",
allow_single_file = True,
),
"_cc_toolchain": attr.label(
default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
),
"_process_wrapper": attr.label(
default = Label("//util/process_wrapper"),
executable = True,
Expand All @@ -196,9 +205,11 @@ rust_bindgen = rule(
),
},
outputs = {"out": "%{name}.rs"},
fragments = ["cpp"],
toolchains = [
str(Label("//bindgen:bindgen_toolchain")),
str(Label("//rust:toolchain")),
"@bazel_tools//tools/cpp:toolchain_type",
],
incompatible_use_toolchain_transition = True,
)
Expand Down