diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-07-16 16:12:23 +0900 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-07-16 17:15:26 +0200 |
| commit | 1791ff7179f689cb54182a1215686f8138850412 (patch) | |
| tree | f161158fce82abf511bfcf4844614d693d5fc006 | |
| parent | 663935593915ad8dc43d10f58ef5eeefc77ef8c4 (diff) | |
| download | linux-stable-1791ff7179f689cb54182a1215686f8138850412.tar.gz linux-stable-1791ff7179f689cb54182a1215686f8138850412.tar.bz2 linux-stable-1791ff7179f689cb54182a1215686f8138850412.zip | |
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: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/Makefile.host | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/Makefile.host b/scripts/Makefile.host index bb6a11f4f193..ab5980f91714 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -43,12 +43,9 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m))) host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs))) # output directory for programs/.o files -# hostprogs-y := tools/build may have been specified. Retrieve directory -host-objdirs := $(dir $(__hostprogs)) -# directory of .o files from prog-objs notation -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))) +# hostprogs-y := tools/build may have been specified. +# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation +host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs)) host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs)))) |