From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Date: Mon, 29 Dec 2008 23:58:00 +0000 (+0100)
Subject: Allow building of crosstools and world with different compilers.
X-Git-Tag: v2.3.0~181^2
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/ded5c50334ec2e5c083ce08e4cd876a9df172139

Allow building of crosstools and world with different compilers.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 57996893b2..91ff0bc6e2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -124,6 +124,8 @@ DESTDIRBASE?=		${OBJTREE}${.CURDIR}
 # anyhow, and we need to be able to override it for stage installs
 .MAKEFLAGS:=	${.MAKEFLAGS:NDESTDIR=*}
 
+WORLD_CCVER?=	${CCVER}
+
 TARGET_ARCH?=	${MACHINE_ARCH}
 .if ${TARGET_ARCH} == ${MACHINE_ARCH}
 TARGET?=	${MACHINE}
@@ -274,7 +276,8 @@ CROSSENV=	MAKEOBJDIRPREFIX=${WORLDDEST} \
 		MACHINE_ARCH=${TARGET_ARCH} \
 		MACHINE=${TARGET} \
 		MACHINE_PLATFORM=${TARGET_PLATFORM} \
-		OBJFORMAT_PATH=${CTOOLSDEST}
+		OBJFORMAT_PATH=${CTOOLSDEST} \
+		CCVER=${WORLD_CCVER}
 
 WMAKEENV=	${CROSSENV} \
 		DESTDIR=${WORLDDEST} \