Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix previous and only force the failure if reloc2bb already failed.

This commit is contained in:
mrg 2011-07-12 03:09:03 +00:00
parent 9474f05d3b
commit e3166ce34c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/amiga/stand/bootblock/boot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.45 2011/07/11 01:24:34 mrg Exp $
# $NetBSD: Makefile,v 1.46 2011/07/12 03:09:03 mrg Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk> # for HOST_SH
@ -98,7 +98,7 @@ CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
boot.amiga: x.out
${RELOC2BB} -S x.out $@ || ${NM} -u x.out && false
${RELOC2BB} -S x.out $@ || (${NM} -u x.out && false)
x.out: xxstart.o libboot.a ${LIBZ}
${LD} ${LDFLAGS} -r -dc -e start -o $@ $>

6
sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2011/07/11 01:24:34 mrg Exp $
# $NetBSD: Makefile,v 1.17 2011/07/12 03:09:03 mrg Exp $
### what we need:
@ -73,10 +73,10 @@ DEFS+= -D__daddr_t=int32_t
.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
bootxx_ffs: x.out
${RELOC2BB} x.out $@ || ${NM} -u x.out && false
${RELOC2BB} x.out $@ || (${NM} -u x.out && false)
bootxx_fd: f.out
${RELOC2BB} -F f.out $@ || ${NM} -u f.out && false
${RELOC2BB} -F f.out $@ || (${NM} -u f.out && false)
x.out: xxstart.o libboot.a
${LD} ${LDFLAGS} -r -dc -e _start -o $@ $>