summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJing Leng <jleng@ambarella.com>2022-05-17 18:51:28 +0800
committerMasahiro Yamada <masahiroy@kernel.org>2022-05-27 15:51:48 +0900
commit23a0cb8e3225122496bfa79172005c587c2d64bf (patch)
tree0b90066594bca3bd8742ba18b62617dd6746fdad /scripts
parent7e284070abe53d448517b80493863595af4ab5f0 (diff)
downloadlinux-stable-23a0cb8e3225122496bfa79172005c587c2d64bf.tar.gz
linux-stable-23a0cb8e3225122496bfa79172005c587c2d64bf.tar.bz2
linux-stable-23a0cb8e3225122496bfa79172005c587c2d64bf.zip
kbuild: Fix include path in scripts/Makefile.modpost
When building an external module, if users don't need to separate the compilation output and source code, they run the following command: "make -C $(LINUX_SRC_DIR) M=$(PWD)". At this point, "$(KBUILD_EXTMOD)" and "$(src)" are the same. If they need to separate them, they run "make -C $(KERNEL_SRC_DIR) O=$(KERNEL_OUT_DIR) M=$(OUT_DIR) src=$(PWD)". Before running the command, they need to copy "Kbuild" or "Makefile" to "$(OUT_DIR)" to prevent compilation failure. So the kernel should change the included path to avoid the copy operation. Signed-off-by: Jing Leng <jleng@ambarella.com> [masahiro: I do not think "M=$(OUT_DIR) src=$(PWD)" is the official way, but this patch is a nice clean up anyway.] Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.modpost3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 48585c4d04ad..0273bf7375e2 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -87,8 +87,7 @@ obj := $(KBUILD_EXTMOD)
src := $(obj)
# Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
-include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
- $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
+include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
# modpost option for external modules
MODPOST += -e