From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 26 Feb 2025 13:30:14 +0000 (+0800)
Subject: kbuild: add dependency from vmlinux to sorttable
X-Git-Tag: v6.15-rc1~11^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82c09de2d4c472ab1b973e6e033671020691e637;p=thirdparty%2Flinux.git

kbuild: add dependency from vmlinux to sorttable

Without this dependency it's really puzzling when we bisect for a "bad"
commit in a series of sorttable change: when "git bisect" switches to
another commit, "make" just does nothing to vmlinux.

Signed-off-by: Xi Ruoyao <xry111@xry111.site>
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
index 873caaa553134..fb79fd6b24654 100644
--- a/scripts/Makefile.vmlinux
+++ b/scripts/Makefile.vmlinux
@@ -79,6 +79,10 @@ ifdef CONFIG_DEBUG_INFO_BTF
 vmlinux: $(RESOLVE_BTFIDS)
 endif
 
+ifdef CONFIG_BUILDTIME_TABLE_SORT
+vmlinux: scripts/sorttable
+endif
+
 # module.builtin.ranges
 # ---------------------------------------------------------------------------
 ifdef CONFIG_BUILTIN_MODULE_RANGES