From owner-svn-src-head@FreeBSD.ORG Wed Jan 30 19:51:16 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BC1FE91A; Wed, 30 Jan 2013 19:51:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 97525192; Wed, 30 Jan 2013 19:51:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UJpGoG067184; Wed, 30 Jan 2013 19:51:16 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UJpGNx067183; Wed, 30 Jan 2013 19:51:16 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201301301951.r0UJpGNx067183@svn.freebsd.org> From: Dimitry Andric Date: Wed, 30 Jan 2013 19:51:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246131 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 30 Jan 2013 19:51:16 -0000 Author: dim Date: Wed Jan 30 19:51:16 2013 New Revision: 246131 URL: http://svnweb.freebsd.org/changeset/base/246131 Log: Fix a problem introduced in r231057: in bsd.own.mk, move the test for whether clang is enabled to just after the last place where it could have been forced to "no". MFC after: 3 days Modified: head/share/mk/bsd.own.mk Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Wed Jan 30 18:40:19 2013 (r246130) +++ head/share/mk/bsd.own.mk Wed Jan 30 19:51:16 2013 (r246131) @@ -481,10 +481,6 @@ MK_ZFS:= no MK_CTF:= no .endif -.if ${MK_CLANG} == "no" -MK_CLANG_EXTRAS:= no -.endif - .if ${MK_CRYPT} == "no" MK_OPENSSL:= no MK_OPENSSH:= no @@ -527,6 +523,7 @@ MK_GDB:= no .endif .if ${MK_CLANG} == "no" +MK_CLANG_EXTRAS:= no MK_CLANG_IS_CC:= no .endif