diff --git a/Makefile.inc1 b/Makefile.inc1
index a4a638cf0a1f..aa71e6862e01 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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)
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 1a506578289c..36471f055eb6 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -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>