Now that external gcc directly natively links to libc++ we can remove

the dirty hack made to fake libstdc++
This commit is contained in:
Baptiste Daroussin 2016-12-10 18:29:39 +00:00
parent 4af79d4f2b
commit 629582ca46
2 changed files with 1 additions and 11 deletions

View File

@ -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)

View File

@ -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>