From 448b21e74a66ac03fa74d509d8b34892e62db7c6 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Wed, 31 Dec 2008 13:15:10 +0100 Subject: [PATCH] Properly pass WORLD_CCVER through to buildworld. --- nrelease/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nrelease/Makefile b/nrelease/Makefile index 7544257a86..fbbb22f485 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -185,13 +185,13 @@ check: .endif buildworld1 buildworld2: - cd ${.CURDIR}/..; ${WORLD_CCVER:C/^..*$/CCVER=/}${WORLD_CCVER} make ${WITH_INSTALLER:C/^/-DWANT_INSTALLER/} ${.TARGET:C/build(.*)2/quick\1/:C/1//} + cd ${.CURDIR}/..; ${WORLD_CCVER:C/^..*$/WORLD_CCVER=/}${WORLD_CCVER} make ${WITH_INSTALLER:C/^/-DWANT_INSTALLER/} ${.TARGET:C/build(.*)2/quick\1/:C/1//} buildkernel1 buildkernel2: .if make(gui) cd ${.CURDIR}/..; \ for kernconf in ${KERNCONF}; do \ - ${KERNEL_CCVER:C/^..*$/CCVER=/}${KERNEL_CCVER} \ + ${WORLD_CCVER:C/^..*$/WORLD_CCVER=/}${WORLD_CCVER} \ make ${.TARGET:C/build(.*)2/quick\1/:C/1//} \ KERNCONF=$${kernconf} KERNCONFDIR=${.CURDIR}/gui/root; \ done @@ -199,7 +199,7 @@ buildkernel1 buildkernel2: cd ${.CURDIR}/..; \ first=; \ for kernconf in ${KERNCONF}; do \ - ${KERNEL_CCVER:C/^..*$/CCVER=/}${KERNEL_CCVER} \ + ${WORLD_CCVER:C/^..*$/WORLD_CCVER=/}${WORLD_CCVER} \ make ${.TARGET:C/build(.*)2/quick\1/:C/1//} \ KERNCONF=$${kernconf} \ $${first:+-DNO_MODULES}; \ -- 2.41.0