Date: Sat, 10 Dec 2016 18:29:39 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309824 - in head: . lib/libc++ Message-ID: <201612101829.uBAITdMo086356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612101829.uBAITdMo086356>