Skip to content

Avoid flattening cc toolchain depset when constructing rust toolchain #3676

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid flattening cc toolchain depset when constructing rust toolchain #3676

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
5 changes: 3 additions & 2 deletions rust/toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,10 @@ def _make_libstd_and_allocator_ccinfo(
)

# Include C++ toolchain files as additional inputs for cross-compilation scenarios
additional_inputs = []
if cc_toolchain and cc_toolchain.all_files:
additional_inputs = cc_toolchain.all_files.to_list()
additional_inputs = cc_toolchain.all_files
else:
additional_inputs = depset()

linking_context, _linking_outputs = cc_common.create_linking_context_from_compilation_outputs(
name = label.name,
Expand Down