aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2021-01-30 17:56:35 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2021-02-01 09:32:07 +0000
commit5cf6f1c4bc281ac45ced086bc2e393f732f2fcc2 (patch)
treee5b938dc5168ca455114f416951199aee1a4140c /tools
parentd6f9c5a6d2f87865f9714d2b8dfd1a9f3080c71e (diff)
downloadsrc-5cf6f1c4bc281ac45ced086bc2e393f732f2fcc2.tar.gz
src-5cf6f1c4bc281ac45ced086bc2e393f732f2fcc2.zip
Remove the MK_LIBCPLUSPLUS option
This option has been equivalent to any form of C++ support since libstdc++ was removed. Therefore, replace all MK_LIBCPLUSPLUS uses with MK_CXX. Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D27974
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc2
-rw-r--r--tools/build/options/WITHOUT_LIBCPLUSPLUS2
-rw-r--r--tools/build/options/WITH_LIBCPLUSPLUS2
3 files changed, 1 insertions, 5 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 4a075a78cf70..87fab14e45e7 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3793,7 +3793,7 @@ OLD_LIBS+=${DEBUG_LIB32_LIBS}
. 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
diff --git a/tools/build/options/WITHOUT_LIBCPLUSPLUS b/tools/build/options/WITHOUT_LIBCPLUSPLUS
deleted file mode 100644
index 2449e30d4b10..000000000000
--- a/tools/build/options/WITHOUT_LIBCPLUSPLUS
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to avoid building libcxxrt and libc++.
diff --git a/tools/build/options/WITH_LIBCPLUSPLUS b/tools/build/options/WITH_LIBCPLUSPLUS
deleted file mode 100644
index 0f30dd8c1e4f..000000000000
--- a/tools/build/options/WITH_LIBCPLUSPLUS
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to build libcxxrt and libc++.