From owner-svn-src-all@FreeBSD.ORG  Tue Feb 22 04:07:15 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68C0B106564A;
	Tue, 22 Feb 2011 04:07:15 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 56EA78FC19;
	Tue, 22 Feb 2011 04:07:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1M47FC9093367;
	Tue, 22 Feb 2011 04:07:15 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M47FWE093365;
	Tue, 22 Feb 2011 04:07:15 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201102220407.p1M47FWE093365@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 22 Feb 2011 04:07:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218934 - head
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Feb 2011 04:07:15 -0000

Author: imp
Date: Tue Feb 22 04:07:15 2011
New Revision: 218934
URL: http://svn.freebsd.org/changeset/base/218934

Log:
  Select building CLANG based on ${TARGET_ARCH} and existence of
  WITH{,OUT}_CLANG.  We default to yes on some archs, no on others,
  unless WITHOUT_CLANG or WITH_CLANG is defined respectively.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Feb 22 04:03:33 2011	(r218933)
+++ head/Makefile.inc1	Tue Feb 22 04:07:15 2011	(r218934)
@@ -42,6 +42,20 @@ TARGET_ARCH=${TARGET}
 .include <bsd.own.mk>
 .include <bsd.arch.inc.mk>
 
+# Clang is a special case.  We have to use it to bootstrap the target, not
+# where we're building from.
+.if ${TARGET_ARCH} == i386 || ${TARGET_ARCH} == amd64 || \
+    ${TARGET_ARCH} == arm || ${TARGET_ARCH} == powerpc64 || \
+    ${TARGET_ARCH} == powerpc
+.if !defined(WITHOUT_CLANG)
+MK_CLANG=yes
+.endif
+.else
+.if !defined(WITH_CLANG)
+MK_CLANG=no
+.endif
+.endif
+
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to
 # grow dependencies on include and lib than vice versa.
@@ -970,11 +984,11 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptre
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-# XXX: There is no way to specify bootstrap tools depending on MK-flags
-# with different per-architecture default values. Always build tblgen.
+.if ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	usr.bin/clang/tblgen
+.endif
 
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \