From: Thomas Weißschuh <linux@weissschuh.net>
Date: Sat, 23 Nov 2024 13:33:37 +0000 (+0100)
Subject: kbuild: add dependency from vmlinux to resolve_btfids
X-Git-Tag: v6.13-rc1~16^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18e9944e56f68423e52505066f79939e7d12a62b;p=thirdparty%2Flinux.git

kbuild: add dependency from vmlinux to resolve_btfids

resolve_btfids is used by link-vmlinux.sh.
In contrast to other configuration options and targets no transitive
dependency between resolve_btfids and vmlinux.
Add an explicit one.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
index 997be5dc7bf52..2ecd350e9c43b 100644
--- a/scripts/Makefile.vmlinux
+++ b/scripts/Makefile.vmlinux
@@ -68,6 +68,9 @@ cmd_link_vmlinux =							\
 targets += vmlinux
 vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE
 	+$(call if_changed_dep,link_vmlinux)
+ifdef CONFIG_DEBUG_INFO_BTF
+vmlinux: $(RESOLVE_BTFIDS)
+endif
 
 # module.builtin.ranges
 # ---------------------------------------------------------------------------