summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-06-23 18:13:28 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-07-01 03:09:28 +0200
commit68980b4704d5d8c8cf2661f9d65a1a20ee455c1b (patch)
tree3f895b66a498218aa7e509e705e28ba891c2536a /Makefile
parentkbuild: fix missed rebuild of modules.builtin (diff)
downloadlinux-68980b4704d5d8c8cf2661f9d65a1a20ee455c1b.tar.xz
linux-68980b4704d5d8c8cf2661f9d65a1a20ee455c1b.zip
kbuild: split modules.order build rule out of 'modules' target
modules.order is a real target. Split its build rule out like modules.builtin Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f8e4f930e497..c3b6dcd5b177 100644
--- a/Makefile
+++ b/Makefile
@@ -1286,12 +1286,14 @@ all: modules
# using awk while concatenating to the final file.
PHONY += modules
-modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
- $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
+modules: $(if $(KBUILD_BUILTIN),vmlinux) modules.order modules.builtin
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh
+modules.order: $(vmlinux-dirs)
+ $(Q)$(AWK) '!x[$$0]++' $(addsuffix /$@, $(vmlinux-dirs)) > $@
+
modbuiltin-dirs := $(addprefix _modbuiltin_, $(vmlinux-dirs))
modules.builtin: $(modbuiltin-dirs)