Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c96a294e authored by Cao jin's avatar Cao jin Committed by Masahiro Yamada
Browse files

kbuild: fix modname for composite modules 



Commit cf4f2193 ("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: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent aeacb019

scripts/Makefile.lib

+2 −2
Original line number Diff line number Diff line
@@ -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: