Now that external gcc directly natively links to libc++ we can remove
the dirty hack made to fake libstdc++
This commit is contained in:
parent
4af79d4f2b
commit
629582ca46
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=309824
@ -591,7 +591,7 @@ XCFLAGS+= -B${WORLDTMP}/usr/lib
|
|||||||
# XXX: This should be checking MK_GNUCXX == no
|
# XXX: This should be checking MK_GNUCXX == no
|
||||||
.if ${X_COMPILER_VERSION} >= 40800
|
.if ${X_COMPILER_VERSION} >= 40800
|
||||||
XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
|
XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
|
||||||
-nostdinc++ -L${WORLDTMP}/../lib/libc++
|
-nostdinc++
|
||||||
.endif
|
.endif
|
||||||
.elif ${WANT_COMPILER_TYPE} == clang || \
|
.elif ${WANT_COMPILER_TYPE} == clang || \
|
||||||
(defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang)
|
(defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang)
|
||||||
|
@ -242,14 +242,4 @@ EXT+= ${HDRDIR}/ext/${hdr}
|
|||||||
.endfor
|
.endfor
|
||||||
EXTDIR= ${CXXINCLUDEDIR}/ext
|
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>
|
.include <bsd.lib.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user