summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-07-31 20:45:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2026-07-31 20:45:28 -0700
commit02dc699f83d04069fdabc996fc22d47cda47a4a9 (patch)
tree8aba814841bbf9c573850954b1d0f336ed0e1bac /Makefile
parent2aa6a5e889594687d6617f9a0cc8a288ac236852 (diff)
parente5a259d98823a93459643b239b71fed7589ab669 (diff)
downloadlinux-02dc699f83d04069fdabc996fc22d47cda47a4a9.tar.gz
linux-02dc699f83d04069fdabc996fc22d47cda47a4a9.zip
Merge tag 'kbuild-fixes-7.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux
Pull Kbuild fixes from Nathan Chancellor: - Fix regression with MO= when building out of tree kernel modules due to incorrectly overwriting build tree's Makefile - Avoid stripping .BTF sections from modules when building debug .rpm packages * tag 'kbuild-fixes-7.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux: kbuild: rpm-pkg: Preserve BTF sections in kernel modules during debuginfo stripping kbuild: Stop modifying $(objtree)/Makefile when building oot-kmods oos
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2f5bf24e3389..060834cd0a4d 100644
--- a/Makefile
+++ b/Makefile
@@ -700,13 +700,11 @@ filechk_makefile = { \
echo "include $(abs_srctree)/Makefile"; \
}
-$(objtree)/Makefile: FORCE
+PHONY += $(CURDIR)/Makefile
+$(CURDIR)/Makefile: FORCE
$(call filechk,makefile)
-# Prevent $(srcroot)/Makefile from inhibiting the rule to run.
-PHONY += $(objtree)/Makefile
-
-outputmakefile: $(objtree)/Makefile
+outputmakefile: $(CURDIR)/Makefile
ifeq ($(KBUILD_EXTMOD),)
@if [ -f $(srctree)/.config -o \
-d $(srctree)/include/config -o \