From caefcdffa5abcee325c28a6b44dd0eaeb5a056ae Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 6 May 2011 14:25:36 +0000 Subject: [PATCH] Use LDFLAGS when linking kernel.bin. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@38577 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/i386-pc/bootstrap/mmakefile.src | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/i386-pc/bootstrap/mmakefile.src b/arch/i386-pc/bootstrap/mmakefile.src index 03bf6c088d..af728bef0b 100644 --- a/arch/i386-pc/bootstrap/mmakefile.src +++ b/arch/i386-pc/bootstrap/mmakefile.src @@ -25,10 +25,17 @@ $(BINDIR)/boot/aros-pc-i386: setup-pc-i386 $(KOBJSDIR)/bootstrap.o $(TARGETDIR)/ $(KOBJSDIR)/bootstrap.o: $(foreach f, $(FILES), $(TARGETDIR)/$(f).o $(TARGETDIR)/$(f).d) $(KERNEL_LD) $(KERNEL_LDFLAGS) -r $(foreach f, $(FILES), $(TARGETDIR)/$(f).o) -o $@ -L$(LIBDIR) -lrom -lm -$(TARGETDIR)/kernel.bin.o: $(KOBJSDIR)/exec_library.o $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/irq_hidd.o - $(TARGET_LD) -Map $(OSGENDIR)/boot/kernel.map -T $(SRCDIR)/$(CURDIR)/kernel.lds -o $(TARGETDIR)/kernel.bin $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_library.o $(KOBJSDIR)/irq_hidd.o -L$(LIBDIR) -larossupport -lrom -larosm -lamiga -lautoinit -llibinit - $(TARGET_STRIP) --strip-unneeded -R .note -R .comment $(TARGETDIR)/kernel.bin - cd $(TARGETDIR) && $(KERNEL_LD) $(KERNEL_LDFLAGS) -r --format binary --oformat elf32-i386 kernel.bin -o $@ +$(TARGETDIR)/kernel.bin.o: $(KOBJSDIR)/exec_library.o \ + $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/irq_hidd.o + $(TARGET_LD) $(LDFLAGS) -Map $(OSGENDIR)/boot/kernel.map \ + -T $(SRCDIR)/$(CURDIR)/kernel.lds -o $(TARGETDIR)/kernel.bin \ + $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_library.o \ + $(KOBJSDIR)/irq_hidd.o -L$(LIBDIR) -larossupport -lrom \ + -larosm -lamiga -lautoinit -llibinit + $(TARGET_STRIP) --strip-unneeded -R .note -R .comment \ + $(TARGETDIR)/kernel.bin + cd $(TARGETDIR) && $(KERNEL_LD) $(KERNEL_LDFLAGS) -r --format binary \ + --oformat elf32-i386 kernel.bin -o $@ #MM clean :: -- 2.11.4.GIT