Skip to content

Commit

Permalink
kbuild: check the presence of include/generated/rustc_cfg
Browse files Browse the repository at this point in the history
Since commit 2f7ab12 ("Kbuild: add Rust support"), Kconfig
generates include/generated/rustc_cfg, but its presence is not checked
in the top-level Makefile. It should be checked similarly to the C
header counterpart, include/generated/autoconf.h.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
Acked-by: Miguel Ojeda <ojeda@kernel.org>
Tested-by: Miguel Ojeda <ojeda@kernel.org>
  • Loading branch information
Masahiro Yamada committed Nov 4, 2024
1 parent ec873a4 commit 985d6cc
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ else # !may-sync-config
# and include/config/auto.conf but do not care if they are up-to-date.
# Use auto.conf to show the error message

checked-configs := include/generated/autoconf.h include/config/auto.conf
checked-configs := include/generated/autoconf.h include/generated/rustc_cfg include/config/auto.conf
missing-configs := $(filter-out $(wildcard $(checked-configs)), $(checked-configs))

ifdef missing-configs
Expand Down Expand Up @@ -1201,7 +1201,8 @@ PHONY += prepare archprepare

archprepare: outputmakefile archheaders archscripts scripts include/config/kernel.release \
asm-generic $(version_h) include/generated/utsrelease.h \
include/generated/compile.h include/generated/autoconf.h remove-stale-files
include/generated/compile.h include/generated/autoconf.h \
include/generated/rustc_cfg remove-stale-files

prepare0: archprepare
$(Q)$(MAKE) $(build)=scripts/mod
Expand Down

0 comments on commit 985d6cc

Please sign in to comment.