From owner-p4-projects@FreeBSD.ORG  Mon Jun  7 21:15:17 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CBB3F1065675; Mon,  7 Jun 2010 21:15:16 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 905EB106566B
	for <perforce@FreeBSD.org>; Mon,  7 Jun 2010 21:15:16 +0000 (UTC)
	(envelope-from andrius@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E41A8FC08
	for <perforce@FreeBSD.org>; Mon,  7 Jun 2010 21:15:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o57LFGCc057711
	for <perforce@FreeBSD.org>; Mon, 7 Jun 2010 21:15:16 GMT
	(envelope-from andrius@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o57LFGlk057709
	for perforce@freebsd.org; Mon, 7 Jun 2010 21:15:16 GMT
	(envelope-from andrius@FreeBSD.org)
Date: Mon, 7 Jun 2010 21:15:16 GMT
Message-Id: <201006072115.o57LFGlk057709@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrius@FreeBSD.org using -f
From: Andrius Morkunas <andrius@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179302 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Jun 2010 21:15:17 -0000

http://p4web.freebsd.org/@@179302?ac=10

Change 179302 by andrius@klevas on 2010/06/07 21:14:52

	Add support for PORTS_CC, USE_CC.
	
	Initial PORTS_CC and some PORTS_CXX support, they replace CC and
	CXX respectively. USE_CC is intended to be used instead of USE_GCC,
	but the latter is still supported for backwards compatibility.

Affected files ...

.. //depot/projects/soc2010/clangports/ports/Mk/bsd.port.mk#2 edit

Differences ...

==== //depot/projects/soc2010/clangports/ports/Mk/bsd.port.mk#2 (text+ko) ====

@@ -1747,6 +1747,38 @@
 CONFIGURE_ENV+=	MAKE=${GMAKE}
 .endif
 
+# Set the defaults
+PORTS_CC?=	gcc
+# PORTS_CXX should only be set if PORTS_CC is neither gcc nor clang
+PORTS_CXX?=	g++
+
+# handle USE_CC
+.if defined(USE_CC)
+# Check if port requires specific compiler
+.if ${USE_CC:Mgcc*} != "" && ${USE_CC:Mclang*} == ""
+PORTS_CC=	gcc
+.elif ${USE_CC:Mclang*} != "" && ${USE_CC:Mgcc*} == ""
+PORTS_CC=	clang
+.endif
+.endif
+
+.if (${PORTS_CC:M*gcc*} != "") || defined(USE_GCC)
+.if defined(USE_CC) && (${USE_CC:Mgcc*} != "")
+USE_GCC=	${USE_CC:Mgcc*:S/gcc//}
+.endif
+CC=			gcc
+CXX=		g++
+.elif (${PORTS_CC:Mclang*} != "")
+# TODO: handle something like USE_CLANG here when/if there's need for that
+BUILD_DEPENDS+=	clang:${PORTSDIR}/devel/llvm-devel
+CC=			clang
+CXX=		clang++
+.else
+# PORTS_CC is set to something weird
+CC=			${PORTS_CC}
+CXX=		${PORTS_CXX}
+.endif
+
 .if defined(USE_GCC) || defined(USE_FORTRAN)
 .include "${PORTSDIR}/Mk/bsd.gcc.mk"
 .endif