From 8a2b4e6296ddaa621cfcb26568d6a521275c31cc Mon Sep 17 00:00:00 2001 From: David Zbarsky Date: Sat, 18 Oct 2025 15:04:01 -0400 Subject: [PATCH] Avoid flattening cc toolchain depset when constructing rust toolchain --- rust/toolchain.bzl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rust/toolchain.bzl b/rust/toolchain.bzl index 2253f7f831..1cde9969bf 100644 --- a/rust/toolchain.bzl +++ b/rust/toolchain.bzl @@ -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,