From 67e051bf870cd262429be4dd55b748e4217d33cd Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Thu, 4 Dec 2008 00:20:05 +0100
Subject: [PATCH] Don't drag the host CCVER into the release build

nrelease was defaulting WORLD_CCVER, which is passed as CCVER to buildworld
and KERNEL_CCVER, which is passed as CCVER to buildkernel, to CCVER.  However
the system makefiles set CCVER themselves, thus dragging their idea of the
default CCVER into the release build.

This commit should fix snapshots being built with gcc34 on chlamydia running 1.8-REL.
---
 nrelease/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 059f3ccfcc..2ddd223b1e 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -105,9 +105,6 @@ ISOFILE ?= ${ISODIR}/dfly.iso
 #
 NRLOBJDIR?= /usr/obj
 
-WORLD_CCVER ?= ${CCVER}
-KERNEL_CCVER ?= ${CCVER}
-
 #########################################################################
 #				BASE ISO TARGETS 			#
 #########################################################################
@@ -160,13 +157,14 @@ check:
 .endif
 
 buildworld1 buildworld2:
-	cd ${.CURDIR}/..; CCVER=${WORLD_CCVER} make ${WITH_INSTALLER:C/^/-DWANT_INSTALLER/} ${.TARGET:C/build(.*)2/quick\1/:C/1//}
+	cd ${.CURDIR}/..; ${WORLD_CCVER:C/^..*$/CCVER=/}${WORLD_CCVER} make ${WITH_INSTALLER:C/^/-DWANT_INSTALLER/} ${.TARGET:C/build(.*)2/quick\1/:C/1//}
 
 buildkernel1 buildkernel2:
 	cd ${.CURDIR}/..; \
 	first=; \
 	for kernconf in ${KERNCONF}; do \
-		CCVER=${KERNEL_CCVER} make ${.TARGET:C/build(.*)2/quick\1/:C/1//} \
+		${KERNEL_CCVER:C/^..*$/CCVER=/}${KERNEL_CCVER} \
+		make ${.TARGET:C/build(.*)2/quick\1/:C/1//} \
 			KERNCONF=$${kernconf} \
 			$${first:+-DNO_MODULES}; \
 		first=done; \
-- 
2.11.4.GIT