On Tue Jan 28, 2025 at 11:14 AM CET, Marc Hartmayer wrote: > On Tue, Jan 28, 2025 at 11:06 AM +0100, Marc Hartmayer <mhartmay@xxxxxxxxxxxxx> wrote: > > This change makes sure that the 'flat.lds' linker script is actually generated > > in the build directory and not source directory - this makes a difference in > > case of an out-of-source build. > > > > Signed-off-by: Marc Hartmayer <mhartmay@xxxxxxxxxxxxx> > > --- > > s390x/Makefile | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/s390x/Makefile b/s390x/Makefile > > index 23342bd64f44..71bfa787fe59 100644 > > --- a/s390x/Makefile > > +++ b/s390x/Makefile > > @@ -182,8 +182,8 @@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ > > $(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\" > > > > .SECONDEXPANSION: > > -%.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o > > - @$(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/flat.lds \ > > > +%.elf: $(FLATLIBS) $(asmlib) s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o > > + @$(CC) $(LDFLAGS) -o $@ -T s390x/flat.lds \ > > s390x/flat.lds should be replaced by $(TESTDIR)/flat.lds fwiw, s/TESTDIR/TEST_DIR/ Otherwise, yes, will fix it up when picking. Thanks!
