From c3f3fe6d836ec064a22482f17cbc0aca768b21a4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 20 Dec 2004 09:11:56 +0000 Subject: [PATCH] Move the CCVER override for the release build from a make command line variable to an environment variable. Make command line variables cannot be overridden which will prevent the buildworld the release target runs from being able to properly override sub-makes during e.g. the GCC-3.4 build. --- nrelease/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nrelease/Makefile b/nrelease/Makefile index 3ff5c860a6..b35ba83af1 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/nrelease/Makefile,v 1.19 2004/11/11 19:45:19 cpressey Exp $ +# $DragonFly: src/nrelease/Makefile,v 1.20 2004/12/20 09:11:56 dillon Exp $ # ISODIR ?= /usr/release @@ -103,16 +103,16 @@ fetchpkgs: .endfor buildworld1: - ( cd ${.CURDIR}/..; make buildworld CCVER=${WORLD_CCVER} ) + ( cd ${.CURDIR}/..; CCVER=${WORLD_CCVER} make buildworld ) buildworld2: - ( cd ${.CURDIR}/..; make -DNOTOOLS -DNOCLEAN buildworld CCVER=${WORLD_CCVER} ) + ( cd ${.CURDIR}/..; CCVER=${WORLD_CCVER} make -DNOTOOLS -DNOCLEAN buildworld ) buildkernel1: - ( cd ${.CURDIR}/..; make buildkernel KERNCONF=${KERNCONF} CCVER=${KERNEL_CCVER} ) + ( cd ${.CURDIR}/..; CCVER=${KERNEL_CCVER} make buildkernel KERNCONF=${KERNCONF} ) buildkernel2: - ( cd ${.CURDIR}/..; make -DNOCLEAN buildkernel KERNCONF=${KERNCONF} CCVER=${KERNEL_CCVER} ) + ( cd ${.CURDIR}/..; CCVER=${KERNEL_CCVER} make -DNOCLEAN buildkernel KERNCONF=${KERNCONF} ) # note that we do not want to mess with any /usr/obj directories not related # to buildworld, buildkernel, or nrelease, so we must supply the proper -- 2.41.0