From owner-svn-src-all@freebsd.org Tue Aug 23 15:22:18 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C229BC30F8; Tue, 23 Aug 2016 15:22:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D3C11A32; Tue, 23 Aug 2016 15:22:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7NFMHBX033003; Tue, 23 Aug 2016 15:22:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7NFMHra033002; Tue, 23 Aug 2016 15:22:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608231522.u7NFMHra033002@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 23 Aug 2016 15:22:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r304682 - 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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2016 15:22:18 -0000 Author: bdrewery Date: Tue Aug 23 15:22:17 2016 New Revision: 304682 URL: https://svnweb.freebsd.org/changeset/base/304682 Log: Re-enable WITH_SYSTEM_COMPILER with WITH_META_MODE. This was disabled in r301468 due to -target/--sysroot sometimes being used in the build and other times not being used. Now that it is always used since r304681, it is safe to combine the features. MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue Aug 23 15:20:32 2016 (r304681) +++ head/share/mk/src.opts.mk Tue Aug 23 15:22:17 2016 (r304682) @@ -356,10 +356,6 @@ MK_ELFTOOLCHAIN_BOOTSTRAP:= no MK_GCC_BOOTSTRAP:= no .endif -.if ${MK_META_MODE} == "yes" -MK_SYSTEM_COMPILER:= no -.endif - .if ${MK_TOOLCHAIN} == "no" MK_BINUTILS:= no MK_CLANG:= no