Skip to content

Commit d1c8349

Browse files
ojedaMa Wupeng
authored and
Ma Wupeng
committed
kbuild: rust: remove unneeded @rustc_cfg to avoid ICE
stable inclusion from stable-v6.6.30 commit 2eed4381ee41759f29adc7e235b91e8978f8e948 bugzilla: https://gitee.com/openeuler/kernel/issues/I9MPZ8 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2eed4381ee41759f29adc7e235b91e8978f8e948 -------------------------------- commit 50cfe93b01475ba36878b65d35d812e1bb48ac71 upstream. When KUnit tests are enabled, under very big kernel configurations (e.g. `allyesconfig`), we can trigger a `rustdoc` ICE [1]: RUSTDOC TK rust/kernel/lib.rs error: the compiler unexpectedly panicked. this is a bug. The reason is that this build step has a duplicated `@rustc_cfg` argument, which contains the kernel configuration, and thus a lot of arguments. The factor 2 happens to be enough to reach the ICE. Thus remove the unneeded `@rustc_cfg`. By doing so, we clean up the command and workaround the ICE. The ICE has been fixed in the upcoming Rust 1.79 [2]. Cc: stable@vger.kernel.org Fixes: a66d733 ("rust: support running Rust documentation tests as KUnit ones") Link: rust-lang/rust#122722 [1] Link: rust-lang/rust#122840 [2] Reviewed-by: Alice Ryhl <aliceryhl@google.com> Link: https://lore.kernel.org/r/20240422091215.526688-1-ojeda@kernel.org Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
1 parent 487e10b commit d1c8349

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

rust/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ quiet_cmd_rustdoc_test_kernel = RUSTDOC TK $<
173173
mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \
174174
OBJTREE=$(abspath $(objtree)) \
175175
$(RUSTDOC) --test $(rust_flags) \
176-
@$(objtree)/include/generated/rustc_cfg \
177176
-L$(objtree)/$(obj) --extern alloc --extern kernel \
178177
--extern build_error --extern macros \
179178
--extern bindings --extern uapi \

0 commit comments

Comments
 (0)