aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Makefile.lib
diff options
context:
space:
mode:
authorCao jin <caoj.fnst@cn.fujitsu.com>2018-03-19 18:01:25 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-26 02:01:25 +0900
commitc96a294eb6972742ed9d55f8d4afa7e0051c0942 (patch)
treec3bbfe9baa460ad075d131f8c691994a51dcc6b6 /scripts/Makefile.lib
parentaeacb019b61c4ea7689085574bd03d2c0810f119 (diff)
downloadlinux-yocto-c96a294eb6972742ed9d55f8d4afa7e0051c0942.tar.gz
linux-yocto-c96a294eb6972742ed9d55f8d4afa7e0051c0942.tar.bz2
linux-yocto-c96a294eb6972742ed9d55f8d4afa7e0051c0942.zip
kbuild: fix modname for composite modules
Commit cf4f21938e13 ("kbuild: Allow to specify composite modules with modname-m") added modname-m support, but missed to update the corresponding multi-objs-m & modname-multi definition. Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/Makefile.lib')
-rw-r--r--scripts/Makefile.lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 5bdfb740047e..f855c2353b42 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -50,7 +50,7 @@ single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))
# Build list of the parts of our composite objects, our composite
# objects depend on those (obviously)
multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y)))
-multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)))
+multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)))
# $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to
# tell kbuild to descend
@@ -173,7 +173,7 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
# If the object belongs to two or more multi-part objects, all of them are
# concatenated with a colon separator.
modname-multi = $(subst $(space),:,$(sort $(foreach m,$(multi-used),\
- $(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))))
+ $(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$(m:.o=)))))
# Useful for describing the dependency of composite objects
# Usage: