Skip to content

Commit e38fa8c

Browse files
authored
Filter panic_files correctly (#3454)
`dot_a_files` look like `libcfg_if-578106348.a`, so the substring check currently is the wrong way round and `panic_files` inadvertently ends up empty.
1 parent 747954f commit e38fa8c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rust/toolchain.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def _rust_stdlib_filegroup_impl(ctx):
6565
alloc_files = [f for f in dot_a_files if "alloc" in f.basename and "std" not in f.basename]
6666
between_alloc_and_core_files = [f for f in dot_a_files if "compiler_builtins" in f.basename]
6767
core_files = [f for f in dot_a_files if ("core" in f.basename or "adler" in f.basename) and "std" not in f.basename]
68-
panic_files = [f for f in dot_a_files if f.basename in ["cfg_if", "libc", "panic_abort", "panic_unwind", "unwind"]]
68+
panic_files = [f for f in dot_a_files if any([c in f.basename for c in ["cfg_if", "libc", "panic_abort", "panic_unwind", "unwind"]])]
6969
between_core_and_std_files = [
7070
f
7171
for f in dot_a_files

0 commit comments

Comments
 (0)