Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2860,7 +2860,7 @@
 _startup_libs=	lib/csu
 _startup_libs+=	lib/libc
 _startup_libs+=	lib/libc_nonshared
-.if ${MK_LIBCPLUSPLUS} != "no"
+.if ${MK_CXX} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 
@@ -2869,7 +2869,7 @@
 
 lib/libgcc_s__L: lib/libc__L
 lib/libgcc_s__L: lib/libc_nonshared__L
-.if ${MK_LIBCPLUSPLUS} != "no"
+.if ${MK_CXX} != "no"
 lib/libcxxrt__L: lib/libgcc_s__L
 .endif
 
@@ -2918,7 +2918,7 @@
 _prebuild_libs+= lib/libregex
 .endif
 
-.if ${MK_LIBCPLUSPLUS} != "no"
+.if ${MK_CXX} != "no"
 _prebuild_libs+= lib/libc++
 .endif
 
@@ -3086,7 +3086,7 @@
 
 lib/libproc__L: \
     ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L
-.if ${MK_CXX} != "no" && ${MK_LIBCPLUSPLUS} != "no"
+.if ${MK_CXX} != "no"
 lib/libproc__L: lib/libcxxrt__L
 .endif
 
Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -181,7 +181,7 @@
 _libclang_rt=	libclang_rt
 .endif
 
-.if ${MK_LIBCPLUSPLUS} != "no"
+.if ${MK_CXX} != "no"
 _libcxxrt=	libcxxrt
 _libcplusplus=	libc++
 _libcplusplus+=	libc++experimental
Index: lib/libproc/Makefile
===================================================================
--- lib/libproc/Makefile
+++ lib/libproc/Makefile
@@ -18,10 +18,8 @@
 
 .if ${MK_CXX} == "no"
 CFLAGS+=	-DNO_CXA_DEMANGLE
-.elif ${MK_LIBCPLUSPLUS} != "no"
-LIBADD+=		cxxrt
 .else
-LIBADD+=	supcplusplus
+LIBADD+=		cxxrt
 .endif
 
 LIBADD+=	elf procstat rtld_db util
Index: share/mk/bsd.libnames.mk
===================================================================
--- share/mk/bsd.libnames.mk
+++ share/mk/bsd.libnames.mk
@@ -141,7 +141,6 @@
 LIBSSL?=	${LIBDESTDIR}${LIBDIR_BASE}/libssl.a
 LIBSSP_NONSHARED?=	${LIBDESTDIR}${LIBDIR_BASE}/libssp_nonshared.a
 LIBSTATS?=	${LIBDESTDIR}${LIBDIR_BASE}/libstats.a
-LIBSTDCPLUSPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdc++.a
 LIBSTDTHREADS?=	${LIBDESTDIR}${LIBDIR_BASE}/libstdthreads.a
 LIBSYSDECODE?=	${LIBDESTDIR}${LIBDIR_BASE}/libsysdecode.a
 LIBTACPLUS?=	${LIBDESTDIR}${LIBDIR_BASE}/libtacplus.a
Index: share/mk/bsd.prog.mk
===================================================================
--- share/mk/bsd.prog.mk
+++ share/mk/bsd.prog.mk
@@ -261,11 +261,7 @@
 .else
 	echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
 .if defined(PROG_CXX)
-.if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++)
 	echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
-.else
-	echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
-.endif
 .endif
 .endif
 .endif	# !defined(NO_EXTRADEPEND)
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -298,11 +298,7 @@
 _DP_rtld_db=	elf procstat
 _DP_procstat=	kvm util elf
 .if ${MK_CXX} == "yes"
-.if ${MK_LIBCPLUSPLUS} != "no"
 _DP_proc=	cxxrt
-.else
-_DP_proc=	supcplusplus
-.endif
 .endif
 .if ${MK_CDDL} != "no"
 _DP_proc+=	ctf
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -125,7 +125,6 @@
     LDNS \
     LDNS_UTILS \
     LEGACY_CONSOLE \
-    LIBCPLUSPLUS \
     LIBPTHREAD \
     LIBTHR \
     LLD \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -3792,7 +3792,7 @@
 .  endif
 .endif
 
-.if ${MK_LIBCPLUSPLUS} == no
+.if ${MK_CXX} == no
 OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
 OLD_FILES+=usr/lib/libc++_p.a
Index: tools/build/options/WITHOUT_GNUCXX
===================================================================
--- tools/build/options/WITHOUT_GNUCXX
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Do not build the GNU C++ stack (g++, libstdc++).
Index: tools/build/options/WITHOUT_LIBCPLUSPLUS
===================================================================
--- tools/build/options/WITHOUT_LIBCPLUSPLUS
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to avoid building libcxxrt and libc++.
Index: tools/build/options/WITH_GNUCXX
===================================================================
--- tools/build/options/WITH_GNUCXX
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Build the GNU C++ stack (g++, libstdc++).
-This option is deprecated and will be removed before
-.Fx 13 .
Index: tools/build/options/WITH_LIBCPLUSPLUS
===================================================================
--- tools/build/options/WITH_LIBCPLUSPLUS
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to build libcxxrt and libc++.