aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2022-11-16 14:20:39 +0000
committerEd Maste <emaste@FreeBSD.org>2023-01-27 02:13:16 +0000
commitac4c695ad61e81d00cff2a03202a4afe94a92513 (patch)
tree41706ae65ed1a337f8e47ccc92b9f4252040435a /cddl
parent9d2f9798175586bdcd3423443804fbbc0cffb8d2 (diff)
downloadsrc-ac4c695ad61e81d00cff2a03202a4afe94a92513.tar.gz
src-ac4c695ad61e81d00cff2a03202a4afe94a92513.zip
Retire WITHOUT_CXX option
Several important base system components are written in C++, and the WITHOUT_CXX option produced a system that was not fully functional. Just accept this, and remove the option to build without C++ support. This reverts commit adc3c128c6603054586a993d117e5dd808deac17. Reviewed by: brooks, kevans, jhb (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33108
Diffstat (limited to 'cddl')
-rw-r--r--cddl/usr.sbin/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 68dc735b3d1b..ef7878f41ade 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -12,8 +12,7 @@ SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_ZFS}+= \
zdb \
- zhack
-SUBDIR.${MK_ZFS}.${MK_CXX}+= \
+ zhack \
zfsd
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"