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

Commit 7f16a339 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: boot/compressed/Makefile: fix "make clean" 



The Kbuild variable "targets" is supposed to be
configuration-independent and reflect "all possible targets".  This is
required to make "make clean" work properly.

Therefore, move all manipulation of "targets" as well as custom rules
out of the x86-32 ifdef statement.  Only leave inside the ifdefs the
things that are genuinely configuration-dependent.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent a57a5c2e

arch/x86/boot/compressed/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ $(obj)/vmlinux.bin: vmlinux FORCE 
	$(call if_changed,objcopy)





ifeq ($(CONFIG_X86_32),y)

targets += vmlinux.bin.all vmlinux.relocs

hostprogs-y := relocs

targets += vmlinux.bin.all vmlinux.relocs relocs

hostprogs-$(CONFIG_X86_32) += relocs



quiet_cmd_relocs = RELOCS  $@

      cmd_relocs = $(obj)/relocs $< > $@;$(obj)/relocs --abs-relocs $<
@@ -43,6 +42,8 @@ quiet_cmd_relocbin = BUILD $@ 
$(obj)/vmlinux.bin.all: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,relocbin)



ifeq ($(CONFIG_X86_32),y)



ifdef CONFIG_RELOCATABLE

$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE

	$(call if_changed,gzip)
@@ -59,6 +60,5 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE 
LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T

endif





$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)