From a9903fcc11fd22ec8b74f2b2cc8d4e64ca0766b2 Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 9 Apr 2004 04:01:42 +0000 Subject: [PATCH] When linking, use ${_MKTARGET_LINK} so that MAKEVERBOSE=1 looks right. --- sys/arch/macppc/stand/bootxx/Makefile | 4 ++-- sys/arch/macppc/stand/ofwboot/Makefile | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/arch/macppc/stand/bootxx/Makefile b/sys/arch/macppc/stand/bootxx/Makefile index 2bf87b5b6df3..fbadd86a7054 100644 --- a/sys/arch/macppc/stand/bootxx/Makefile +++ b/sys/arch/macppc/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/02/28 05:24:56 matt Exp $ +# $NetBSD: Makefile,v 1.10 2004/04/09 04:01:42 matt Exp $ PROG= bootxx NOMAN= # defined @@ -11,8 +11,8 @@ LINKFLAGS= -x -N -Ttext 4000 -e _start CLEANFILES+= ${PROG}.sym ${PROG}: ${OBJS} + ${_MKTARGET_LINK} ${LD} -o ${.TARGET}.sym ${LINKFLAGS} ${OBJS} - @${SIZE} ${.TARGET}.sym ${OBJCOPY} -O binary ${.TARGET}.sym ${.TARGET} .include diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile index db596ac5b0b8..50c34ade0d19 100644 --- a/sys/arch/macppc/stand/ofwboot/Makefile +++ b/sys/arch/macppc/stand/ofwboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/03/12 19:13:38 wrstuden Exp $ +# $NetBSD: Makefile,v 1.43 2004/04/09 04:01:42 matt Exp $ S= ${.CURDIR}/../../../.. @@ -91,6 +91,7 @@ vers.c: version all realall: ${PROG} ${PROG}.xcf ${PROG}.elf ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} + ${_MKTARGET_LINK} ${LD} -s -N -Ttext ${RELOC} -Bstatic -o ${PROG}.el1 \ ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${OBJCOPY} -O binary ${PROG}.el1 ${PROG} @@ -98,10 +99,12 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} .include ${PROG}.elf: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} + ${_MKTARGET_LINK} ${LD} -s -N -Ttext ${RELOC} -Bstatic -o ${PROG}.elf \ ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${PROG}.xcf: ${OBJS} ${XCOFFXTRAOBJ} ${LIBSA} ${LIBZ} ${LIBKERN} + ${_MKTARGET_LINK} ${LD} -s -N -T ${.CURDIR}/../fixcoff/elf32_powerpc_merge.x -e _entry \ -Ttext ${RELOC} -Bstatic -o ${PROG}.mrg ${XCOFFXTRAOBJ} \ ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}