Skip to content

Commit 23a0cb8

Browse files
Jing Lengmasahir0y
authored andcommitted
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 <[email protected]> [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 <[email protected]>
1 parent 7e28407 commit 23a0cb8

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

scripts/Makefile.modpost

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ obj := $(KBUILD_EXTMOD)
8787
src := $(obj)
8888

8989
# Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
90-
include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
91-
$(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
90+
include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
9291

9392
# modpost option for external modules
9493
MODPOST += -e

0 commit comments

Comments
 (0)