Properly pass WORLD_CCVER through to buildworld.
authorSimon Schubert <corecode@dragonflybsd.org>
Wed, 31 Dec 2008 12:15:10 +0000 (13:15 +0100)
committerSimon Schubert <corecode@dragonflybsd.org>
Wed, 31 Dec 2008 12:15:10 +0000 (13:15 +0100)
nrelease/Makefile

index 7544257..fbbb22f 100644 (file)
@@ -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}; \