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

Commit 97e3226e authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: handle the dependency of multi-objs hostprogs appropriately 



Assume we have a Makefile like:

hostprogs-y := foo bar
foo-objs := foo1.o foo2.o
bar-objs := bar1.o bar2.o

Without this commit, the host program foo depends on all of
foo1.o foo2.o bar1.o bar2.o.

This commit allows to handle the dependency of each host program
separately.

Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent c8589d1e

scripts/Makefile.host

+4 −2
Original line number Original line Diff line number Diff line
@@ -96,8 +96,9 @@ quiet_cmd_host-cmulti = HOSTLD $@ 
      cmd_host-cmulti	= $(HOSTCC) $(HOSTLDFLAGS) -o $@ \

      cmd_host-cmulti	= $(HOSTCC) $(HOSTLDFLAGS) -o $@ \

			  $(addprefix $(obj)/,$($(@F)-objs)) \

			  $(addprefix $(obj)/,$($(@F)-objs)) \

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

$(host-cmulti): $(obj)/%: $(host-cobjs) FORCE

$(host-cmulti): FORCE

	$(call if_changed,host-cmulti)

	$(call if_changed,host-cmulti)

$(call multi_depend, $(host-cmulti), , -objs)





# Create .o file from a single .c file

# Create .o file from a single .c file

# host-cobjs -> .o

# host-cobjs -> .o
@@ -113,8 +114,9 @@ quiet_cmd_host-cxxmulti = HOSTLD $@ 
			  $(foreach o,objs cxxobjs,\

			  $(foreach o,objs cxxobjs,\

			  $(addprefix $(obj)/,$($(@F)-$(o)))) \

			  $(addprefix $(obj)/,$($(@F)-$(o)))) \

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))

$(host-cxxmulti): $(obj)/%: $(host-cobjs) $(host-cxxobjs) FORCE

$(host-cxxmulti): FORCE

	$(call if_changed,host-cxxmulti)

	$(call if_changed,host-cxxmulti)

$(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs)





# Create .o file from a single .cc (C++) file

# Create .o file from a single .cc (C++) file

quiet_cmd_host-cxxobjs	= HOSTCXX $@

quiet_cmd_host-cxxobjs	= HOSTCXX $@