Skip to content
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

Jump to bottom

Change transitive_libs in DepInfo to a depset #673

Merged
merged 1 commit into from
Apr 1, 2021
Merged

Change transitive_libs in DepInfo to a depset #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions rust/private/rustc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def collect_deps(label, deps, proc_macro_deps, aliases, toolchain):
transitive = transitive_noncrates,
order = "topological", # dylib link flag ordering matters.
),
transitive_libs = transitive_libs.to_list(),
transitive_libs = transitive_libs,
transitive_build_infos = depset(transitive = transitive_build_infos),
dep_env = build_info.dep_env if build_info else None,
),
Expand Down Expand Up @@ -283,7 +283,6 @@ def collect_inputs(
compile_inputs = depset(
getattr(files, "data", []) +
getattr(files, "compile_data", []) +
dep_info.transitive_libs +
[toolchain.rustc] +
toolchain.crosstool_files +
([build_info.rustc_env, build_info.flags] if build_info else []) +
Expand All @@ -293,6 +292,7 @@ def collect_inputs(
toolchain.rust_lib.files,
linker_depset,
crate_info.srcs,
dep_info.transitive_libs,
],
)
build_env_files = getattr(files, "rustc_env_files", [])
Expand Down
2 changes: 1 addition & 1 deletion rust/private/rustdoc_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ def _rust_doc_test_impl(ctx):
# The test script compiles the crate and runs it, so it needs both compile and runtime inputs.
compile_inputs = depset(
[crate.output] +
dep_info.transitive_libs +
[toolchain.rust_doc] +
[toolchain.rustc] +
toolchain.crosstool_files,
transitive = [
crate.srcs,
dep_info.transitive_libs,
toolchain.rustc_lib.files,
toolchain.rust_lib.files,
],
Expand Down