From owner-svn-src-head@freebsd.org  Sat Dec 10 18:29:40 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C8CFDC70E20;
 Sat, 10 Dec 2016 18:29:40 +0000 (UTC)
 (envelope-from bapt@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 8B0231BB6;
 Sat, 10 Dec 2016 18:29:40 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBAITd4t086358;
 Sat, 10 Dec 2016 18:29:39 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBAITdMo086356;
 Sat, 10 Dec 2016 18:29:39 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201612101829.uBAITdMo086356@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 10 Dec 2016 18:29:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309824 - in head: . lib/libc++
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Dec 2016 18:29:40 -0000

Author: bapt
Date: Sat Dec 10 18:29:39 2016
New Revision: 309824
URL: https://svnweb.freebsd.org/changeset/base/309824

Log:
  Now that external gcc directly natively links to libc++ we can remove
  the dirty hack made to fake libstdc++

Modified:
  head/Makefile.inc1
  head/lib/libc++/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Dec 10 18:07:16 2016	(r309823)
+++ head/Makefile.inc1	Sat Dec 10 18:29:39 2016	(r309824)
@@ -591,7 +591,7 @@ XCFLAGS+=	-B${WORLDTMP}/usr/lib
 # XXX: This should be checking MK_GNUCXX == no
 .if ${X_COMPILER_VERSION} >= 40800
 XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
-		-nostdinc++ -L${WORLDTMP}/../lib/libc++
+		-nostdinc++
 .endif
 .elif ${WANT_COMPILER_TYPE} == clang || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang)

Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile	Sat Dec 10 18:07:16 2016	(r309823)
+++ head/lib/libc++/Makefile	Sat Dec 10 18:29:39 2016	(r309824)
@@ -242,14 +242,4 @@ EXT+=		${HDRDIR}/ext/${hdr}
 .endfor
 EXTDIR=		${CXXINCLUDEDIR}/ext
 
-.if ${MK_GNUCXX} == "no" && ${COMPILER_TYPE} == "gcc"
-CLEANFILES+=	libstdc++.so libstdc++.a
-
-afterinstall:
-	${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.so \
-		${.OBJDIR}/libstdc++.so
-	${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.a \
-		${.OBJDIR}/libstdc++.a
-.endif
-
 .include <bsd.lib.mk>