Skip to content

Commit

Permalink
rustc: pass depset as transitive depset, rather than direct (#625)
Browse files Browse the repository at this point in the history
I tripped on --incompatible_disable_depset_items which appears to be
on by default at work.

Co-authored-by: Augie Fackler <augie@google.com>
  • Loading branch information
durin42 and durin42 authored Mar 3, 2021
1 parent 9eb5eeb commit 2de6496
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rust/private/rustc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def collect_deps(label, deps, proc_macro_deps, aliases, toolchain):
linker_inputs = dep[CcInfo].linking_context.linker_inputs.to_list()
libs = [get_preferred_artifact(lib) for li in linker_inputs for lib in li.libraries]
transitive_noncrate_libs.append(depset(libs))
transitive_noncrates.append(depset(dep[CcInfo].linking_context.linker_inputs))
transitive_noncrates.append(dep[CcInfo].linking_context.linker_inputs)
elif BuildInfo in dep:
if build_info:
fail("Several deps are providing build information, only one is allowed in the dependencies", "deps")
Expand Down

0 comments on commit 2de6496

Please sign in to comment.