From 7bd540a729a35162310f2f9b336f949ab5866da3 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 25 Mar 2003 18:37:59 +0000 Subject: [PATCH] Fix cross building case where the host is not a NetBSD host. We need to set MAKE for the subshell that's used to populate the work tree. It needs to be the the correct make (in the cross build case: nbmake + args) so that when makeobsolete is run it can pickup this value. Otherwise makeobsolete defaults to the host's make is used which might not understand some of NetBSD make's constructs. This fixes, mostly, the build of NetBSD/hpcmips on a FreeBSD-current system. --- distrib/common/Makefile.image | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/distrib/common/Makefile.image b/distrib/common/Makefile.image index d7a6564ae2e2..a743f822edfa 100644 --- a/distrib/common/Makefile.image +++ b/distrib/common/Makefile.image @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.image,v 1.20 2003/03/11 07:18:38 lukem Exp $ +# $NetBSD: Makefile.image,v 1.21 2003/03/25 18:37:59 imp Exp $ # # Makefile snippet to build a tree from the provided lists, # and make an ffs file system image from that tree @@ -45,7 +45,8 @@ ${WORKBUILT}: ${IMAGEDEPENDS} ${WORKSPEC} ${PARSELISTDEP} ${LISTS} -rm -rf ${WORKDIR} ${WORKBUILT} mkdir -m 755 ${WORKDIR} ${MTREE} -def ${WORKSPEC} -p ${WORKDIR}/ -UW - ${PARSELIST} -v mode=populate ${LISTS} | sh -e ${POPULATE_DEBUG} \ + ${PARSELIST} -v mode=populate ${LISTS} | \ + MAKE=${MAKE} sh -e ${POPULATE_DEBUG} \ && touch ${WORKBUILT} CLEANFILES+= ${WORKBUILT}