From owner-svn-src-head@FreeBSD.ORG Tue Feb 22 04:03:33 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C86D6106566B; Tue, 22 Feb 2011 04:03:33 +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 B67108FC08; Tue, 22 Feb 2011 04:03:33 +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 p1M43XL7093238; Tue, 22 Feb 2011 04:03:33 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1M43X1k093236; Tue, 22 Feb 2011 04:03:33 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201102220403.p1M43X1k093236@svn.freebsd.org> From: Warner Losh Date: Tue, 22 Feb 2011 04:03:33 +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: r218933 - head/share/mk X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 04:03:33 -0000 Author: imp Date: Tue Feb 22 04:03:33 2011 New Revision: 218933 URL: http://svn.freebsd.org/changeset/base/218933 Log: Testing based on MACHINE_ARCH is problematic. Default to yes to build clang. A separate change will fix buildworld to default to yes or no based on the target. Modified: head/share/mk/bsd.own.mk Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Tue Feb 22 00:37:53 2011 (r218932) +++ head/share/mk/bsd.own.mk Tue Feb 22 04:03:33 2011 (r218933) @@ -282,18 +282,6 @@ WITH_IDEA= .endif # -# Default behaviour of MK_CLANG depends on the architecture. -# -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "powerpc" -_clang_yes=CLANG -_clang_no= -.else -_clang_yes= -_clang_no=CLANG -.endif - -# # MK_* options which default to "yes". # .for var in \ @@ -320,7 +308,7 @@ _clang_no=CLANG BZIP2 \ CALENDAR \ CDDL \ - ${_clang_yes} \ + CLANG \ CPP \ CRYPT \ CTM \ @@ -424,7 +412,6 @@ MK_${var}:= yes BIND_SIGCHASE \ BIND_XML \ BSD_GREP \ - ${_clang_no} \ GPIO \ HESIOD \ IDEA