From owner-svn-src-all@FreeBSD.ORG  Tue Oct 21 20:00:50 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5C224F61;
 Tue, 21 Oct 2014 20:00:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 483C9FB8;
 Tue, 21 Oct 2014 20:00:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9LK0oao061586;
 Tue, 21 Oct 2014 20:00:50 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9LK0oQn061585;
 Tue, 21 Oct 2014 20:00:50 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201410212000.s9LK0oQn061585@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 21 Oct 2014 20:00:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273406 - 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.18-1
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/options/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, 21 Oct 2014 20:00:50 -0000

Author: bapt
Date: Tue Oct 21 20:00:49 2014
New Revision: 273406
URL: https://svnweb.freebsd.org/changeset/base/273406

Log:
  Always use libc++ as the default c++ stack when building with an external gcc 4.8+
  While here disable building gcc from base when using gcc 4.8+
  
  Reviewed by:	imp

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Tue Oct 21 19:58:23 2014	(r273405)
+++ head/share/mk/src.opts.mk	Tue Oct 21 20:00:49 2014	(r273406)
@@ -358,4 +358,12 @@ MK_${vv:H}:=	${MK_${vv:T}}
 MK_LLDB:=	no
 .endif
 
+# gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case.
+# while in theory we could build it with that, we don't want to do
+# that since it creates too much confusion for too little gain.
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800
+MK_GNUCXX:=no
+MK_GCC:=no
 .endif
+
+.endif #  !target(__<src.opts.mk>__)