From d4ea321a9720877213dc3f188e7b1eff202363d4 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 19 Jun 2019 13:55:15 +0100 Subject: [PATCH] zipl/boot/Makefile: fix failure to build, do not specify .lds twice. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Whilst stage3.lds is a dependency, it is specified via SFLAGS and must not be repeated again along all the .o files. Filter anything but .o files. Fixes failure to build from source on Ubuntu 19.10. Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/s390-tools/+bug/1833238 Closes: https://github.com/ibm-s390-tools/s390-tools/pull/63 Signed-off-by: Dimitri John Ledkov Acked-by: Stefan Haberland Signed-off-by: Jan Höppner --- zipl/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile index b4111830..0af520a2 100644 --- a/zipl/boot/Makefile +++ b/zipl/boot/Makefile @@ -59,7 +59,7 @@ stage3.exec: head.o stage3.o kdump3.o libc.o sclp.o sclp_stage3.o \ 2) SFLAGS="$(NO_PIE_LINKFLAGS) -nostdlib -Wl,-T,stage2.lds";; \ 3) SFLAGS="$(NO_PIE_LINKFLAGS) -nostdlib -Wl,-T,stage3.lds";; \ esac; \ - $(LINK) $$SFLAGS -m64 $^ -o $@ + $(LINK) $$SFLAGS -m64 $(filter %.o, $^) -o $@ %.bin: %.exec $(OBJCOPY) -O binary \