From b62ddc136384ac750336fb6a68486434a07e0fbc Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 16 Jun 2001 06:28:07 +0000
Subject: [PATCH] Work around what looks like a bad make(1) bug.  For some
 reason, make(1) wants to build loader.sym *before* the .o files.  Eliminating
 one seeminly intermediate step avoids the problem.  Somehow, it seems that
 variables are not getting expanded at the right time. Any explanations would
 be appreciated...

Changing:
${BASE}.sym: ${OBJS} ${LIBSTAND} ${LIBFICL} ${LIBALPHA} ${CRT} vers.o
	${LD} ...
To:
BASEOBJS= ${OBJS} ${LIBSTAND} ${LIBFICL} ${LIBALPHA} ${CRT} vers.o

${BASE}.sym: ${BASEOBJS}
	echo ${BASEOBJS}
	${LD} ...
.. the echo only shows LIBFICL, CRT and vers.o. ${OBJS} is not included.
---
 sys/boot/alpha/common/Makefile.common | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common
index 32a6e0db3df..b3575fb9371 100644
--- a/sys/boot/alpha/common/Makefile.common
+++ b/sys/boot/alpha/common/Makefile.common
@@ -40,20 +40,18 @@ CRT=		start.o
 STRIP=
 BINDIR?=	/boot
 
-all: ${BASE}
+all: ${BASE} ${BASE}.help
 
 vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 	${CC} -c vers.c
 
-${BASE}: ${BASE}.sym ${BASE}.help
-	objcopy -O binary ${BASE}.sym ${BASE}
-
-${BASE}.sym: ${OBJS} ${LIBSTAND} ${LIBFICL} ${LIBALPHA} ${CRT} vers.o
+${BASE}: ${OBJS} ${LIBSTAND} ${LIBFICL} ${LIBALPHA} ${CRT} vers.o
 	${LD} -o ${BASE}.sym -M -e start -N -Ttext ${LOAD_ADDRESS} \
 	${CRT} ${OBJS} vers.o \
 	-L${DESTDIR}${LIBDIR} ${LIBSTAND} ${LIBALPHA} ${LIBFICL} ${LIBSTAND} \
 	>${.OBJDIR}/${BASE}.list
+	objcopy -O binary ${BASE}.sym ${BASE}
 
 CLEANFILES+=	${BASE}.help
 ${BASE}.help: help.common help.alpha