diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-09 01:19:31 -0400 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-09 08:51:17 -0400 |
| commit | d6c6ab93e17f139c9b7f9b077307ebddc05a7990 (patch) | |
| tree | 7f90db1fe0d1249a07bd1f83ccacdd1007519c03 | |
| parent | 3fca1700c4c38aaec1cea0c143b0ff8da029fd9c (diff) | |
kbuild: remove deprecated host-progs variable
The host-progs has been kept as an alias of hostprogs-y for a long time
(at least since the beginning of Git era), with the clear prompt:
Usage of host-progs is deprecated. Please replace with hostprogs-y!
Enough time for the migration has passed.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | arch/xtensa/boot/Makefile | 3 | ||||
| -rw-r--r-- | scripts/Makefile.build | 7 | ||||
| -rw-r--r-- | scripts/Makefile.clean | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 53e4178711e6..dc9e0ba7122c 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile | |||
| @@ -30,8 +30,7 @@ Image: boot-elf | |||
| 30 | zImage: boot-redboot | 30 | zImage: boot-redboot |
| 31 | uImage: $(obj)/uImage | 31 | uImage: $(obj)/uImage |
| 32 | 32 | ||
| 33 | boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y)) \ | 33 | boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y)) |
| 34 | $(addprefix $(obj)/,$(host-progs)) | ||
| 35 | $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) | 34 | $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) |
| 36 | 35 | ||
| 37 | OBJCOPYFLAGS = --strip-all -R .comment -R .note.gnu.build-id -O binary | 36 | OBJCOPYFLAGS = --strip-all -R .comment -R .note.gnu.build-id -O binary |
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 514ed63ff571..1adaac4e10d8 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
| @@ -53,13 +53,6 @@ endif | |||
| 53 | 53 | ||
| 54 | include scripts/Makefile.lib | 54 | include scripts/Makefile.lib |
| 55 | 55 | ||
| 56 | ifdef host-progs | ||
| 57 | ifneq ($(hostprogs-y),$(host-progs)) | ||
| 58 | $(warning kbuild: $(obj)/Makefile - Usage of host-progs is deprecated. Please replace with hostprogs-y!) | ||
| 59 | hostprogs-y += $(host-progs) | ||
| 60 | endif | ||
| 61 | endif | ||
| 62 | |||
| 63 | # Do not include host rules unless needed | 56 | # Do not include host rules unless needed |
| 64 | ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),) | 57 | ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),) |
| 65 | include scripts/Makefile.host | 58 | include scripts/Makefile.host |
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index 17ef94c635cd..0b80e3207b20 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean | |||
| @@ -38,7 +38,6 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn)) | |||
| 38 | 38 | ||
| 39 | __clean-files := $(extra-y) $(extra-m) $(extra-) \ | 39 | __clean-files := $(extra-y) $(extra-m) $(extra-) \ |
| 40 | $(always) $(targets) $(clean-files) \ | 40 | $(always) $(targets) $(clean-files) \ |
| 41 | $(host-progs) \ | ||
| 42 | $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \ | 41 | $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \ |
| 43 | $(hostlibs-y) $(hostlibs-m) $(hostlibs-) \ | 42 | $(hostlibs-y) $(hostlibs-m) $(hostlibs-) \ |
| 44 | $(hostcxxlibs-y) $(hostcxxlibs-m) | 43 | $(hostcxxlibs-y) $(hostcxxlibs-m) |
