Commit 1791ff71 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek

kbuild: clean-up and bug fix of scripts/Makefile.host

Assume we have a Makefile like this:

  hostprogs-y := foo
  foo-cxxobjs := bar/baz.o
  foo-objs := qux/quux.o

In this case, Kbuild creates bar/ directory,
but fails to create qux/ directory.

This commit re-writes directory creation more simply,
fixing that bug.
Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 66393559
...@@ -43,12 +43,9 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m))) ...@@ -43,12 +43,9 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs))) host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
# output directory for programs/.o files # output directory for programs/.o files
# hostprogs-y := tools/build may have been specified. Retrieve directory # hostprogs-y := tools/build may have been specified.
host-objdirs := $(dir $(__hostprogs)) # Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
# directory of .o files from prog-objs notation host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))
host-objdirs += $(dir $(foreach f,$(host-cmulti), $($(f)-objs)))
# directory of .o files from prog-cxxobjs notation
host-objdirs += $(dir $(foreach f,$(host-cxxmulti), $($(f)-cxxobjs)))
host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs)))) host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment