From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  2 20:47:11 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B0E81065680;
	Tue,  2 Jun 2009 20:47:11 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E9F88FC23;
	Tue,  2 Jun 2009 20:47:11 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n52KlA3W027863;
	Tue, 2 Jun 2009 20:47:10 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52KlAa2027859;
	Tue, 2 Jun 2009 20:47:10 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906022047.n52KlAa2027859@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 2 Jun 2009 20:47:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193346 - in projects/clangbsd: . gnu/usr.bin/cc/cc
	share/mk usr.bin/clang/bin/clang
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jun 2009 20:47:11 -0000

Author: ed
Date: Tue Jun  2 20:47:10 2009
New Revision: 193346
URL: http://svn.freebsd.org/changeset/base/193346

Log:
  Add CLANG_IS_CC, which will install Clang as cc, instead of GCC.
  
  This also means it will build everything with Clang.

Modified:
  projects/clangbsd/Makefile.inc1
  projects/clangbsd/gnu/usr.bin/cc/cc/Makefile
  projects/clangbsd/share/mk/bsd.own.mk
  projects/clangbsd/usr.bin/clang/bin/clang/Makefile

Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1	Tue Jun  2 20:44:21 2009	(r193345)
+++ projects/clangbsd/Makefile.inc1	Tue Jun  2 20:47:10 2009	(r193346)
@@ -1021,8 +1021,13 @@ _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
+.if ${MK_CLANG_IS_CC} != "no"
+_clang=		usr.bin/clang
+.endif
+
 cross-tools:
 .for _tool in \
+    ${_clang} \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc \
     usr.bin/sed \

Modified: projects/clangbsd/gnu/usr.bin/cc/cc/Makefile
==============================================================================
--- projects/clangbsd/gnu/usr.bin/cc/cc/Makefile	Tue Jun  2 20:44:21 2009	(r193345)
+++ projects/clangbsd/gnu/usr.bin/cc/cc/Makefile	Tue Jun  2 20:47:10 2009	(r193346)
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-PROG=	cc
-MAN=	gcc.1
+PROG=	gcc
 SRCS+=  gccspec.c
 
 NO_SHARED?=yes
 
-LINKS=	${BINDIR}/cc ${BINDIR}/gcc
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS=	${BINDIR}/gcc ${BINDIR}/cc
+.endif
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 
 .include <bsd.prog.mk>

Modified: projects/clangbsd/share/mk/bsd.own.mk
==============================================================================
--- projects/clangbsd/share/mk/bsd.own.mk	Tue Jun  2 20:44:21 2009	(r193345)
+++ projects/clangbsd/share/mk/bsd.own.mk	Tue Jun  2 20:47:10 2009	(r193346)
@@ -408,6 +408,7 @@ MK_${var}:=	yes
     BIND_SIGCHASE \
     BIND_XML \
     CLANG \
+    CLANG_IS_CC \
     GNU_CPIO \
     HESIOD \
     IDEA

Modified: projects/clangbsd/usr.bin/clang/bin/clang/Makefile
==============================================================================
--- projects/clangbsd/usr.bin/clang/bin/clang/Makefile	Tue Jun  2 20:44:21 2009	(r193345)
+++ projects/clangbsd/usr.bin/clang/bin/clang/Makefile	Tue Jun  2 20:47:10 2009	(r193346)
@@ -8,6 +8,10 @@ SRCDIR=	tools/clang/tools/driver
 SRCS=	driver.cpp
 MAN=
 
+.if ${MK_CLANG_IS_CC} != "no"
+LINKS=	${BINDIR}/clang ${BINDIR}/cc
+.endif
+
 TGHDRS=	DiagnosticCommonKinds
 LIBDEPS=clangdriver clangfrontend clanglex clangbasic \
 	llvmbitreader llvmbitwriter llvmsupport llvmsystem