summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-05-11 06:21:49 +0200
committerMasahiro Yamada <masahiroy@kernel.org>2020-05-25 17:03:16 +0200
commit8451791d1ff0fd229e3f5ef267a32423f5b5540f (patch)
treefb5ea5a090179496b5e5b805b5fb75cb484561ad /Makefile
parentkbuild: error out if targets prefixed with '__' are directly run (diff)
downloadlinux-8451791d1ff0fd229e3f5ef267a32423f5b5540f.tar.xz
linux-8451791d1ff0fd229e3f5ef267a32423f5b5540f.zip
kbuild: make module name conflict fatal error
I think all the warnings have been fixed by now. Make it a fatal error. Check it before modpost because we need to stop building *.ko files. Also, pass modules.order via a script parameter. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1915630cc24b..1f5bbfb31103 100644
--- a/Makefile
+++ b/Makefile
@@ -1335,9 +1335,12 @@ all: modules
# using awk while concatenating to the final file.
PHONY += modules
-modules: $(if $(KBUILD_BUILTIN),vmlinux) modules.order
+modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_check
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh
+
+PHONY += modules_check
+modules_check: modules.order
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh $<
modules.order: descend
$(Q)$(AWK) '!x[$$0]++' $(addsuffix /$@, $(build-dirs)) > $@