Index: Makefile.inc1 =================================================================== --- Makefile.inc1 +++ Makefile.inc1 @@ -2911,18 +2911,14 @@ _startup_libs= lib/csu _startup_libs+= lib/libc _startup_libs+= lib/libc_nonshared -.if ${MK_CXX} != "no" _startup_libs+= lib/libcxxrt -.endif _prereq_libs+= lib/libgcc_eh lib/libgcc_s _startup_libs+= lib/libgcc_eh lib/libgcc_s lib/libgcc_s__L: lib/libc__L lib/libgcc_s__L: lib/libc_nonshared__L -.if ${MK_CXX} != "no" lib/libcxxrt__L: lib/libgcc_s__L -.endif _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libhdb} \ @@ -2934,6 +2930,7 @@ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ + lib/libc++ \ lib/libelf lib/libexpat \ lib/libfigpar \ ${_lib_libgssapi} \ @@ -2971,10 +2968,6 @@ _prebuild_libs+= lib/libregex .endif -.if ${MK_CXX} != "no" -_prebuild_libs+= lib/libc++ -.endif - lib/libgeom__L: lib/libexpat__L lib/libsbuf__L lib/libkvm__L: lib/libelf__L @@ -3141,10 +3134,8 @@ .endif 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" -lib/libproc__L: lib/libcxxrt__L -.endif + ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} \ + lib/libelf__L lib/librtld_db__L lib/libutil__L lib/libcxxrt__L .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE Index: cddl/usr.sbin/Makefile =================================================================== --- cddl/usr.sbin/Makefile +++ cddl/usr.sbin/Makefile @@ -15,9 +15,7 @@ .if ${MK_ZFS} != "no" _zdb= zdb _zhack= zhack -. if ${MK_CXX} != "no" _zfsd= zfsd -. endif .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" Index: lib/Makefile =================================================================== --- lib/Makefile +++ lib/Makefile @@ -15,8 +15,9 @@ libc_nonshared \ libcompiler_rt \ ${_libclang_rt} \ - ${_libcplusplus} \ - ${_libcxxrt} \ + libc++ \ + libc++experimental \ + libcxxrt \ libelf \ libssp \ libssp_nonshared \ @@ -47,6 +48,7 @@ libcompat \ libcrypt \ libdevctl \ + libdevdctl \ libdevinfo \ libdevstat \ libdl \ @@ -167,7 +169,6 @@ .endif SUBDIR.${MK_CUSE}+= libcuse -SUBDIR.${MK_CXX}+= libdevdctl SUBDIR.${MK_TOOLCHAIN}+=libpe SUBDIR.${MK_DIALOG}+= libdpv SUBDIR.${MK_FILE}+= libmagic @@ -180,7 +181,7 @@ # The libraries under libclang_rt can only be built by clang and when we enable # C++ support. Furthermore, they can only be built for certain architectures. -.if ${COMPILER_TYPE} == "clang" && ${MK_CXX} != "no" && \ +.if ${COMPILER_TYPE} == "clang" && \ (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "powerpc") @@ -189,12 +190,6 @@ .error "Requested build with sanitizers but cannot build runtime libraries!" .endif -.if ${MK_CXX} != "no" -_libcxxrt= libcxxrt -_libcplusplus= libc++ -_libcplusplus+= libc++experimental -.endif - SUBDIR.${MK_EFI}+= libefivar SUBDIR.${MK_GOOGLETEST}+= googletest SUBDIR.${MK_NETGRAPH}+= libnetgraph @@ -226,7 +221,7 @@ SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet SUBDIR.${MK_TESTS_SUPPORT}+= atf -SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= liblutok +SUBDIR.${MK_TESTS_SUPPORT}+= liblutok SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_UNBOUND}+= libunbound SUBDIR.${MK_USB}+= libusbhid libusb Index: lib/atf/Makefile =================================================================== --- lib/atf/Makefile +++ lib/atf/Makefile @@ -28,7 +28,7 @@ .include SUBDIR= libatf-c -SUBDIR.${MK_CXX}+= libatf-c++ +SUBDIR+= libatf-c++ SUBDIR.${MK_TESTS}+= tests Index: lib/libproc/Makefile =================================================================== --- lib/libproc/Makefile +++ lib/libproc/Makefile @@ -16,13 +16,7 @@ CFLAGS+= -I${.CURDIR} -.if ${MK_CXX} == "no" -CFLAGS+= -DNO_CXA_DEMANGLE -.else -LIBADD+= cxxrt -.endif - -LIBADD+= elf procstat rtld_db util +LIBADD+= cxxrt elf procstat rtld_db util .if ${MK_CDDL} != "no" LIBADD+= ctf Index: sbin/Makefile =================================================================== --- sbin/Makefile +++ sbin/Makefile @@ -9,6 +9,7 @@ comcontrol \ conscontrol \ ddb \ + devd \ devfs \ devmatch \ dhclient \ @@ -69,7 +70,6 @@ umount SUBDIR.${MK_CCD}+= ccdconfig -SUBDIR.${MK_CXX}+= devd SUBDIR.${MK_HAST}+= hastctl SUBDIR.${MK_HAST}+= hastd SUBDIR.${MK_INET6}+= rtsol Index: share/mk/src.libnames.mk =================================================================== --- share/mk/src.libnames.mk +++ share/mk/src.libnames.mk @@ -309,9 +309,7 @@ .endif _DP_rtld_db= elf procstat _DP_procstat= kvm util elf -.if ${MK_CXX} == "yes" _DP_proc= cxxrt -.endif .if ${MK_CDDL} != "no" _DP_proc+= ctf .endif Index: share/mk/src.opts.mk =================================================================== --- share/mk/src.opts.mk +++ share/mk/src.opts.mk @@ -85,7 +85,6 @@ CROSS_COMPILER \ CRYPT \ CUSE \ - CXX \ CXGBETOOL \ DIALOG \ DICT \ @@ -390,15 +389,6 @@ MK_KERBEROS_SUPPORT:= no .endif -.if ${MK_CXX} == "no" -MK_CLANG:= no -MK_GOOGLETEST:= no -MK_OFED:= no -MK_OPENMP:= no -MK_PMC:= no -MK_TESTS:= no -.endif - .if ${MK_DIALOG} == "no" MK_BSDINSTALL:= no .endif Index: tools/build/mk/OptionalObsoleteFiles.inc =================================================================== --- tools/build/mk/OptionalObsoleteFiles.inc +++ tools/build/mk/OptionalObsoleteFiles.inc @@ -1640,14 +1640,6 @@ OLD_DIRS+=usr/include/fs/cuse .endif -# devd(8) not listed here on purpose -.if ${MK_CXX} == no -OLD_FILES+=usr/bin/CC -OLD_FILES+=usr/bin/c++ -OLD_FILES+=usr/bin/g++ -OLD_FILES+=usr/libexec/cc1plus -.endif - .if ${MK_DEBUG_FILES} == no .if exists(${DESTDIR}/usr/lib/debug) DEBUG_DIRS!=find ${DESTDIR}/usr/lib/debug -mindepth 1 \ @@ -3810,410 +3802,6 @@ . endif .endif -.if ${MK_CXX} == no -OLD_LIBS+=lib/libcxxrt.so.1 -OLD_FILES+=usr/lib/libc++.a -OLD_FILES+=usr/lib/libc++_p.a -OLD_FILES+=usr/lib/libc++experimental.a -OLD_FILES+=usr/lib/libc++.so -OLD_LIBS+=usr/lib/libc++.so.1 -OLD_FILES+=usr/lib/libcxxrt.a -OLD_FILES+=usr/lib/libcxxrt.so -OLD_FILES+=usr/lib/libcxxrt_p.a -OLD_FILES+=usr/include/c++/v1/__algorithm/adjacent_find.h -OLD_FILES+=usr/include/c++/v1/__algorithm/all_of.h -OLD_FILES+=usr/include/c++/v1/__algorithm/any_of.h -OLD_FILES+=usr/include/c++/v1/__algorithm/binary_search.h -OLD_FILES+=usr/include/c++/v1/__algorithm/clamp.h -OLD_FILES+=usr/include/c++/v1/__algorithm/comp.h -OLD_FILES+=usr/include/c++/v1/__algorithm/comp_ref_type.h -OLD_FILES+=usr/include/c++/v1/__algorithm/copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/copy_backward.h -OLD_FILES+=usr/include/c++/v1/__algorithm/copy_if.h -OLD_FILES+=usr/include/c++/v1/__algorithm/copy_n.h -OLD_FILES+=usr/include/c++/v1/__algorithm/count.h -OLD_FILES+=usr/include/c++/v1/__algorithm/count_if.h -OLD_FILES+=usr/include/c++/v1/__algorithm/equal.h -OLD_FILES+=usr/include/c++/v1/__algorithm/equal_range.h -OLD_FILES+=usr/include/c++/v1/__algorithm/fill.h -OLD_FILES+=usr/include/c++/v1/__algorithm/fill_n.h -OLD_FILES+=usr/include/c++/v1/__algorithm/find.h -OLD_FILES+=usr/include/c++/v1/__algorithm/find_end.h -OLD_FILES+=usr/include/c++/v1/__algorithm/find_first_of.h -OLD_FILES+=usr/include/c++/v1/__algorithm/find_if.h -OLD_FILES+=usr/include/c++/v1/__algorithm/find_if_not.h -OLD_FILES+=usr/include/c++/v1/__algorithm/for_each.h -OLD_FILES+=usr/include/c++/v1/__algorithm/for_each_n.h -OLD_FILES+=usr/include/c++/v1/__algorithm/generate.h -OLD_FILES+=usr/include/c++/v1/__algorithm/generate_n.h -OLD_FILES+=usr/include/c++/v1/__algorithm/half_positive.h -OLD_FILES+=usr/include/c++/v1/__algorithm/includes.h -OLD_FILES+=usr/include/c++/v1/__algorithm/inplace_merge.h -OLD_FILES+=usr/include/c++/v1/__algorithm/is_heap.h -OLD_FILES+=usr/include/c++/v1/__algorithm/is_heap_until.h -OLD_FILES+=usr/include/c++/v1/__algorithm/is_partitioned.h -OLD_FILES+=usr/include/c++/v1/__algorithm/is_permutation.h -OLD_FILES+=usr/include/c++/v1/__algorithm/is_sorted.h -OLD_FILES+=usr/include/c++/v1/__algorithm/is_sorted_until.h -OLD_FILES+=usr/include/c++/v1/__algorithm/iter_swap.h -OLD_FILES+=usr/include/c++/v1/__algorithm/lexicographical_compare.h -OLD_FILES+=usr/include/c++/v1/__algorithm/lower_bound.h -OLD_FILES+=usr/include/c++/v1/__algorithm/make_heap.h -OLD_FILES+=usr/include/c++/v1/__algorithm/max.h -OLD_FILES+=usr/include/c++/v1/__algorithm/max_element.h -OLD_FILES+=usr/include/c++/v1/__algorithm/merge.h -OLD_FILES+=usr/include/c++/v1/__algorithm/min.h -OLD_FILES+=usr/include/c++/v1/__algorithm/min_element.h -OLD_FILES+=usr/include/c++/v1/__algorithm/minmax.h -OLD_FILES+=usr/include/c++/v1/__algorithm/minmax_element.h -OLD_FILES+=usr/include/c++/v1/__algorithm/mismatch.h -OLD_FILES+=usr/include/c++/v1/__algorithm/move.h -OLD_FILES+=usr/include/c++/v1/__algorithm/move_backward.h -OLD_FILES+=usr/include/c++/v1/__algorithm/next_permutation.h -OLD_FILES+=usr/include/c++/v1/__algorithm/none_of.h -OLD_FILES+=usr/include/c++/v1/__algorithm/nth_element.h -OLD_FILES+=usr/include/c++/v1/__algorithm/partial_sort.h -OLD_FILES+=usr/include/c++/v1/__algorithm/partial_sort_copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/partition.h -OLD_FILES+=usr/include/c++/v1/__algorithm/partition_copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/partition_point.h -OLD_FILES+=usr/include/c++/v1/__algorithm/pop_heap.h -OLD_FILES+=usr/include/c++/v1/__algorithm/prev_permutation.h -OLD_FILES+=usr/include/c++/v1/__algorithm/push_heap.h -OLD_FILES+=usr/include/c++/v1/__algorithm/remove.h -OLD_FILES+=usr/include/c++/v1/__algorithm/remove_copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/remove_copy_if.h -OLD_FILES+=usr/include/c++/v1/__algorithm/remove_if.h -OLD_FILES+=usr/include/c++/v1/__algorithm/replace.h -OLD_FILES+=usr/include/c++/v1/__algorithm/replace_copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/replace_copy_if.h -OLD_FILES+=usr/include/c++/v1/__algorithm/replace_if.h -OLD_FILES+=usr/include/c++/v1/__algorithm/reverse.h -OLD_FILES+=usr/include/c++/v1/__algorithm/reverse_copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/rotate.h -OLD_FILES+=usr/include/c++/v1/__algorithm/rotate_copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/sample.h -OLD_FILES+=usr/include/c++/v1/__algorithm/search.h -OLD_FILES+=usr/include/c++/v1/__algorithm/search_n.h -OLD_FILES+=usr/include/c++/v1/__algorithm/set_difference.h -OLD_FILES+=usr/include/c++/v1/__algorithm/set_intersection.h -OLD_FILES+=usr/include/c++/v1/__algorithm/set_symmetric_difference.h -OLD_FILES+=usr/include/c++/v1/__algorithm/set_union.h -OLD_FILES+=usr/include/c++/v1/__algorithm/shift_left.h -OLD_FILES+=usr/include/c++/v1/__algorithm/shift_right.h -OLD_FILES+=usr/include/c++/v1/__algorithm/shuffle.h -OLD_FILES+=usr/include/c++/v1/__algorithm/sift_down.h -OLD_FILES+=usr/include/c++/v1/__algorithm/sort.h -OLD_FILES+=usr/include/c++/v1/__algorithm/sort_heap.h -OLD_FILES+=usr/include/c++/v1/__algorithm/stable_partition.h -OLD_FILES+=usr/include/c++/v1/__algorithm/stable_sort.h -OLD_FILES+=usr/include/c++/v1/__algorithm/swap_ranges.h -OLD_FILES+=usr/include/c++/v1/__algorithm/transform.h -OLD_FILES+=usr/include/c++/v1/__algorithm/unique.h -OLD_FILES+=usr/include/c++/v1/__algorithm/unique_copy.h -OLD_FILES+=usr/include/c++/v1/__algorithm/unwrap_iter.h -OLD_FILES+=usr/include/c++/v1/__algorithm/upper_bound.h -OLD_DIRS+=usr/include/c++/v1/__algorithm -OLD_FILES+=usr/include/c++/v1/__availability -OLD_FILES+=usr/include/c++/v1/__bit_reference -OLD_FILES+=usr/include/c++/v1/__bits -OLD_FILES+=usr/include/c++/v1/__bsd_locale_defaults.h -OLD_FILES+=usr/include/c++/v1/__bsd_locale_fallbacks.h -OLD_FILES+=usr/include/c++/v1/__config -OLD_FILES+=usr/include/c++/v1/__config_site -OLD_FILES+=usr/include/c++/v1/__debug -OLD_FILES+=usr/include/c++/v1/__errc -OLD_FILES+=usr/include/c++/v1/__format/format_error.h -OLD_FILES+=usr/include/c++/v1/__format/format_parse_context.h -OLD_DIRS+=usr/include/c++/v1/__format -OLD_FILES+=usr/include/c++/v1/__function_like.h -OLD_FILES+=usr/include/c++/v1/__functional/binary_function.h -OLD_FILES+=usr/include/c++/v1/__functional/binary_negate.h -OLD_FILES+=usr/include/c++/v1/__functional/bind.h -OLD_FILES+=usr/include/c++/v1/__functional/bind_front.h -OLD_FILES+=usr/include/c++/v1/__functional/binder1st.h -OLD_FILES+=usr/include/c++/v1/__functional/binder2nd.h -OLD_FILES+=usr/include/c++/v1/__functional/default_searcher.h -OLD_FILES+=usr/include/c++/v1/__functional/function.h -OLD_FILES+=usr/include/c++/v1/__functional/hash.h -OLD_FILES+=usr/include/c++/v1/__functional/identity.h -OLD_FILES+=usr/include/c++/v1/__functional/invoke.h -OLD_FILES+=usr/include/c++/v1/__functional/is_transparent.h -OLD_FILES+=usr/include/c++/v1/__functional/mem_fn.h -OLD_FILES+=usr/include/c++/v1/__functional/mem_fun_ref.h -OLD_FILES+=usr/include/c++/v1/__functional/not_fn.h -OLD_FILES+=usr/include/c++/v1/__functional/operations.h -OLD_FILES+=usr/include/c++/v1/__functional/perfect_forward.h -OLD_FILES+=usr/include/c++/v1/__functional/pointer_to_binary_function.h -OLD_FILES+=usr/include/c++/v1/__functional/pointer_to_unary_function.h -OLD_FILES+=usr/include/c++/v1/__functional/ranges_operations.h -OLD_FILES+=usr/include/c++/v1/__functional/reference_wrapper.h -OLD_FILES+=usr/include/c++/v1/__functional/unary_function.h -OLD_FILES+=usr/include/c++/v1/__functional/unary_negate.h -OLD_FILES+=usr/include/c++/v1/__functional/unwrap_ref.h -OLD_FILES+=usr/include/c++/v1/__functional/weak_result_type.h -OLD_DIRS+=usr/include/c++/v1/__functional -OLD_FILES+=usr/include/c++/v1/__functional_base -OLD_FILES+=usr/include/c++/v1/__hash_table -OLD_FILES+=usr/include/c++/v1/__iterator/access.h -OLD_FILES+=usr/include/c++/v1/__iterator/advance.h -OLD_FILES+=usr/include/c++/v1/__iterator/back_insert_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/common_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/concepts.h -OLD_FILES+=usr/include/c++/v1/__iterator/counted_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/data.h -OLD_FILES+=usr/include/c++/v1/__iterator/default_sentinel.h -OLD_FILES+=usr/include/c++/v1/__iterator/distance.h -OLD_FILES+=usr/include/c++/v1/__iterator/empty.h -OLD_FILES+=usr/include/c++/v1/__iterator/erase_if_container.h -OLD_FILES+=usr/include/c++/v1/__iterator/front_insert_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/incrementable_traits.h -OLD_FILES+=usr/include/c++/v1/__iterator/insert_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/istream_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/istreambuf_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/iter_move.h -OLD_FILES+=usr/include/c++/v1/__iterator/iter_swap.h -OLD_FILES+=usr/include/c++/v1/__iterator/iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/iterator_traits.h -OLD_FILES+=usr/include/c++/v1/__iterator/move_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/next.h -OLD_FILES+=usr/include/c++/v1/__iterator/ostream_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/ostreambuf_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/prev.h -OLD_FILES+=usr/include/c++/v1/__iterator/projected.h -OLD_FILES+=usr/include/c++/v1/__iterator/readable_traits.h -OLD_FILES+=usr/include/c++/v1/__iterator/reverse_access.h -OLD_FILES+=usr/include/c++/v1/__iterator/reverse_iterator.h -OLD_FILES+=usr/include/c++/v1/__iterator/size.h -OLD_FILES+=usr/include/c++/v1/__iterator/wrap_iter.h -OLD_DIRS+=usr/include/c++/v1/__iterator -OLD_FILES+=usr/include/c++/v1/__libcpp_version -OLD_FILES+=usr/include/c++/v1/__locale -OLD_FILES+=usr/include/c++/v1/__memory/addressof.h -OLD_FILES+=usr/include/c++/v1/__memory/allocation_guard.h -OLD_FILES+=usr/include/c++/v1/__memory/allocator.h -OLD_FILES+=usr/include/c++/v1/__memory/allocator_arg_t.h -OLD_FILES+=usr/include/c++/v1/__memory/allocator_traits.h -OLD_FILES+=usr/include/c++/v1/__memory/auto_ptr.h -OLD_FILES+=usr/include/c++/v1/__memory/compressed_pair.h -OLD_FILES+=usr/include/c++/v1/__memory/construct_at.h -OLD_FILES+=usr/include/c++/v1/__memory/pointer_safety.h -OLD_FILES+=usr/include/c++/v1/__memory/pointer_traits.h -OLD_FILES+=usr/include/c++/v1/__memory/raw_storage_iterator.h -OLD_FILES+=usr/include/c++/v1/__memory/shared_ptr.h -OLD_FILES+=usr/include/c++/v1/__memory/temporary_buffer.h -OLD_FILES+=usr/include/c++/v1/__memory/uninitialized_algorithms.h -OLD_FILES+=usr/include/c++/v1/__memory/unique_ptr.h -OLD_FILES+=usr/include/c++/v1/__memory/uses_allocator.h -OLD_DIRS+=usr/include/c++/v1/__memory -OLD_FILES+=usr/include/c++/v1/__mutex_base -OLD_FILES+=usr/include/c++/v1/__node_handle -OLD_FILES+=usr/include/c++/v1/__nullptr -OLD_FILES+=usr/include/c++/v1/__random/uniform_int_distribution.h -OLD_DIRS+=usr/include/c++/v1/__random -OLD_FILES+=usr/include/c++/v1/__ranges/access.h -OLD_FILES+=usr/include/c++/v1/__ranges/all.h -OLD_FILES+=usr/include/c++/v1/__ranges/common_view.h -OLD_FILES+=usr/include/c++/v1/__ranges/concepts.h -OLD_FILES+=usr/include/c++/v1/__ranges/copyable_box.h -OLD_FILES+=usr/include/c++/v1/__ranges/dangling.h -OLD_FILES+=usr/include/c++/v1/__ranges/data.h -OLD_FILES+=usr/include/c++/v1/__ranges/drop_view.h -OLD_FILES+=usr/include/c++/v1/__ranges/empty.h -OLD_FILES+=usr/include/c++/v1/__ranges/empty_view.h -OLD_FILES+=usr/include/c++/v1/__ranges/enable_borrowed_range.h -OLD_FILES+=usr/include/c++/v1/__ranges/enable_view.h -OLD_FILES+=usr/include/c++/v1/__ranges/non_propagating_cache.h -OLD_FILES+=usr/include/c++/v1/__ranges/ref_view.h -OLD_FILES+=usr/include/c++/v1/__ranges/size.h -OLD_FILES+=usr/include/c++/v1/__ranges/subrange.h -OLD_FILES+=usr/include/c++/v1/__ranges/transform_view.h -OLD_FILES+=usr/include/c++/v1/__ranges/view_interface.h -OLD_DIRS+=usr/include/c++/v1/__ranges -OLD_FILES+=usr/include/c++/v1/__split_buffer -OLD_FILES+=usr/include/c++/v1/__std_stream -OLD_FILES+=usr/include/c++/v1/__string -OLD_FILES+=usr/include/c++/v1/__threading_support -OLD_FILES+=usr/include/c++/v1/__tree -OLD_FILES+=usr/include/c++/v1/__tuple -OLD_FILES+=usr/include/c++/v1/__undef_macros -OLD_FILES+=usr/include/c++/v1/__utility/__decay_copy.h -OLD_FILES+=usr/include/c++/v1/__utility/as_const.h -OLD_FILES+=usr/include/c++/v1/__utility/cmp.h -OLD_FILES+=usr/include/c++/v1/__utility/declval.h -OLD_FILES+=usr/include/c++/v1/__utility/exchange.h -OLD_FILES+=usr/include/c++/v1/__utility/forward.h -OLD_FILES+=usr/include/c++/v1/__utility/in_place.h -OLD_FILES+=usr/include/c++/v1/__utility/integer_sequence.h -OLD_FILES+=usr/include/c++/v1/__utility/move.h -OLD_FILES+=usr/include/c++/v1/__utility/pair.h -OLD_FILES+=usr/include/c++/v1/__utility/piecewise_construct.h -OLD_FILES+=usr/include/c++/v1/__utility/rel_ops.h -OLD_FILES+=usr/include/c++/v1/__utility/swap.h -OLD_FILES+=usr/include/c++/v1/__utility/to_underlying.h -OLD_DIRS+=usr/include/c++/v1/__utility -OLD_FILES+=usr/include/c++/v1/__variant/monostate.h -OLD_DIRS+=usr/include/c++/v1/__variant -OLD_FILES+=usr/include/c++/v1/algorithm -OLD_FILES+=usr/include/c++/v1/any -OLD_FILES+=usr/include/c++/v1/array -OLD_FILES+=usr/include/c++/v1/atomic -OLD_FILES+=usr/include/c++/v1/barrier -OLD_FILES+=usr/include/c++/v1/bit -OLD_FILES+=usr/include/c++/v1/bitset -OLD_FILES+=usr/include/c++/v1/cassert -OLD_FILES+=usr/include/c++/v1/ccomplex -OLD_FILES+=usr/include/c++/v1/cctype -OLD_FILES+=usr/include/c++/v1/cerrno -OLD_FILES+=usr/include/c++/v1/cfenv -OLD_FILES+=usr/include/c++/v1/cfloat -OLD_FILES+=usr/include/c++/v1/charconv -OLD_FILES+=usr/include/c++/v1/chrono -OLD_FILES+=usr/include/c++/v1/cinttypes -OLD_FILES+=usr/include/c++/v1/ciso646 -OLD_FILES+=usr/include/c++/v1/climits -OLD_FILES+=usr/include/c++/v1/clocale -OLD_FILES+=usr/include/c++/v1/cmath -OLD_FILES+=usr/include/c++/v1/codecvt -OLD_FILES+=usr/include/c++/v1/compare -OLD_FILES+=usr/include/c++/v1/complex -OLD_FILES+=usr/include/c++/v1/complex.h -OLD_FILES+=usr/include/c++/v1/concepts -OLD_FILES+=usr/include/c++/v1/condition_variable -OLD_FILES+=usr/include/c++/v1/csetjmp -OLD_FILES+=usr/include/c++/v1/csignal -OLD_FILES+=usr/include/c++/v1/cstdarg -OLD_FILES+=usr/include/c++/v1/cstdbool -OLD_FILES+=usr/include/c++/v1/cstddef -OLD_FILES+=usr/include/c++/v1/cstdint -OLD_FILES+=usr/include/c++/v1/cstdio -OLD_FILES+=usr/include/c++/v1/cstdlib -OLD_FILES+=usr/include/c++/v1/cstring -OLD_FILES+=usr/include/c++/v1/ctgmath -OLD_FILES+=usr/include/c++/v1/ctime -OLD_FILES+=usr/include/c++/v1/ctype.h -OLD_FILES+=usr/include/c++/v1/cwchar -OLD_FILES+=usr/include/c++/v1/cwctype -OLD_FILES+=usr/include/c++/v1/cxxabi.h -OLD_FILES+=usr/include/c++/v1/deque -OLD_FILES+=usr/include/c++/v1/errno.h -OLD_FILES+=usr/include/c++/v1/exception -OLD_FILES+=usr/include/c++/v1/execution -OLD_FILES+=usr/include/c++/v1/experimental/__config -OLD_FILES+=usr/include/c++/v1/experimental/__memory -OLD_FILES+=usr/include/c++/v1/experimental/algorithm -OLD_FILES+=usr/include/c++/v1/experimental/coroutine -OLD_FILES+=usr/include/c++/v1/experimental/deque -OLD_FILES+=usr/include/c++/v1/experimental/filesystem -OLD_FILES+=usr/include/c++/v1/experimental/forward_list -OLD_FILES+=usr/include/c++/v1/experimental/functional -OLD_FILES+=usr/include/c++/v1/experimental/iterator -OLD_FILES+=usr/include/c++/v1/experimental/list -OLD_FILES+=usr/include/c++/v1/experimental/map -OLD_FILES+=usr/include/c++/v1/experimental/memory_resource -OLD_FILES+=usr/include/c++/v1/experimental/propagate_const -OLD_FILES+=usr/include/c++/v1/experimental/regex -OLD_FILES+=usr/include/c++/v1/experimental/set -OLD_FILES+=usr/include/c++/v1/experimental/simd -OLD_FILES+=usr/include/c++/v1/experimental/string -OLD_FILES+=usr/include/c++/v1/experimental/type_traits -OLD_FILES+=usr/include/c++/v1/experimental/unordered_map -OLD_FILES+=usr/include/c++/v1/experimental/unordered_set -OLD_FILES+=usr/include/c++/v1/experimental/utility -OLD_FILES+=usr/include/c++/v1/experimental/vector -OLD_DIRS+=usr/include/c++/v1/experimental -OLD_FILES+=usr/include/c++/v1/ext/__hash -OLD_FILES+=usr/include/c++/v1/ext/hash_map -OLD_FILES+=usr/include/c++/v1/ext/hash_set -OLD_DIRS+=usr/include/c++/v1/ext -OLD_FILES+=usr/include/c++/v1/fenv.h -OLD_FILES+=usr/include/c++/v1/filesystem -OLD_FILES+=usr/include/c++/v1/float.h -OLD_FILES+=usr/include/c++/v1/format -OLD_FILES+=usr/include/c++/v1/forward_list -OLD_FILES+=usr/include/c++/v1/fstream -OLD_FILES+=usr/include/c++/v1/functional -OLD_FILES+=usr/include/c++/v1/future -OLD_FILES+=usr/include/c++/v1/initializer_list -OLD_FILES+=usr/include/c++/v1/inttypes.h -OLD_FILES+=usr/include/c++/v1/iomanip -OLD_FILES+=usr/include/c++/v1/ios -OLD_FILES+=usr/include/c++/v1/iosfwd -OLD_FILES+=usr/include/c++/v1/iostream -OLD_FILES+=usr/include/c++/v1/istream -OLD_FILES+=usr/include/c++/v1/iterator -OLD_FILES+=usr/include/c++/v1/latch -OLD_FILES+=usr/include/c++/v1/limits -OLD_FILES+=usr/include/c++/v1/limits.h -OLD_FILES+=usr/include/c++/v1/list -OLD_FILES+=usr/include/c++/v1/locale -OLD_FILES+=usr/include/c++/v1/locale.h -OLD_FILES+=usr/include/c++/v1/map -OLD_FILES+=usr/include/c++/v1/math.h -OLD_FILES+=usr/include/c++/v1/memory -OLD_FILES+=usr/include/c++/v1/module.modulemap -OLD_FILES+=usr/include/c++/v1/mutex -OLD_FILES+=usr/include/c++/v1/new -OLD_FILES+=usr/include/c++/v1/numbers -OLD_FILES+=usr/include/c++/v1/numeric -OLD_FILES+=usr/include/c++/v1/optional -OLD_FILES+=usr/include/c++/v1/ostream -OLD_FILES+=usr/include/c++/v1/queue -OLD_FILES+=usr/include/c++/v1/random -OLD_FILES+=usr/include/c++/v1/ranges -OLD_FILES+=usr/include/c++/v1/ratio -OLD_FILES+=usr/include/c++/v1/regex -OLD_FILES+=usr/include/c++/v1/scoped_allocator -OLD_FILES+=usr/include/c++/v1/semaphore -OLD_FILES+=usr/include/c++/v1/set -OLD_FILES+=usr/include/c++/v1/setjmp.h -OLD_FILES+=usr/include/c++/v1/shared_mutex -OLD_FILES+=usr/include/c++/v1/span -OLD_FILES+=usr/include/c++/v1/sstream -OLD_FILES+=usr/include/c++/v1/stack -OLD_FILES+=usr/include/c++/v1/stdbool.h -OLD_FILES+=usr/include/c++/v1/stddef.h -OLD_FILES+=usr/include/c++/v1/stdexcept -OLD_FILES+=usr/include/c++/v1/stdint.h -OLD_FILES+=usr/include/c++/v1/stdio.h -OLD_FILES+=usr/include/c++/v1/stdlib.h -OLD_FILES+=usr/include/c++/v1/streambuf -OLD_FILES+=usr/include/c++/v1/string -OLD_FILES+=usr/include/c++/v1/string.h -OLD_FILES+=usr/include/c++/v1/string_view -OLD_FILES+=usr/include/c++/v1/strstream -OLD_FILES+=usr/include/c++/v1/system_error -OLD_FILES+=usr/include/c++/v1/tgmath.h -OLD_FILES+=usr/include/c++/v1/thread -OLD_FILES+=usr/include/c++/v1/tuple -OLD_FILES+=usr/include/c++/v1/type_traits -OLD_FILES+=usr/include/c++/v1/typeindex -OLD_FILES+=usr/include/c++/v1/typeinfo -OLD_FILES+=usr/include/c++/v1/unordered_map -OLD_FILES+=usr/include/c++/v1/unordered_set -OLD_FILES+=usr/include/c++/v1/unwind-arm.h -OLD_FILES+=usr/include/c++/v1/unwind-itanium.h -OLD_FILES+=usr/include/c++/v1/unwind.h -OLD_FILES+=usr/include/c++/v1/utility -OLD_FILES+=usr/include/c++/v1/valarray -OLD_FILES+=usr/include/c++/v1/variant -OLD_FILES+=usr/include/c++/v1/vector -OLD_FILES+=usr/include/c++/v1/version -OLD_FILES+=usr/include/c++/v1/wchar.h -OLD_FILES+=usr/include/c++/v1/wctype.h -OLD_DIRS+=usr/include/c++/v1 -OLD_FILES+=usr/lib32/libc++.a -OLD_FILES+=usr/lib32/libc++.so -OLD_LIBS+=usr/lib32/libc++.so.1 -OLD_FILES+=usr/lib32/libc++_p.a -OLD_FILES+=usr/lib32/libc++experimental.a -OLD_FILES+=usr/lib32/libc++fs.a -OLD_FILES+=usr/lib32/libcxxrt.a -OLD_FILES+=usr/lib32/libcxxrt.so -OLD_LIBS+=usr/lib32/libcxxrt.so.1 -OLD_FILES+=usr/lib32/libcxxrt_p.a -.endif - .if ${MK_LLD} == no OLD_FILES+=usr/bin/ld.lld .endif Index: usr.bin/Makefile =================================================================== --- usr.bin/Makefile +++ usr.bin/Makefile @@ -32,6 +32,7 @@ cut \ diff \ dirname \ + dtc \ du \ elfctl \ elfdump \ @@ -214,7 +215,6 @@ SUBDIR.${MK_GAMES}+= pom SUBDIR.${MK_GAMES}+= primes SUBDIR.${MK_GAMES}+= random -SUBDIR.${MK_CXX}+= dtc .if ${MK_GH_BC} == "yes" SUBDIR+= gh-bc .else @@ -251,7 +251,7 @@ SUBDIR.${MK_SENDMAIL}+= vacation SUBDIR.${MK_TALK}+= talk SUBDIR.${MK_TELNET}+= telnet -SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= kyua +SUBDIR.${MK_TESTS_SUPPORT}+= kyua SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TEXTPROC}+= ul SUBDIR.${MK_TFTP}+= tftp @@ -284,9 +284,7 @@ SUBDIR.${MK_USB}+= usbhidaction SUBDIR.${MK_USB}+= usbhidctl SUBDIR.${MK_UTMPX}+= last -.if ${MK_CXX} != "no" SUBDIR.${MK_UTMPX}+= users -.endif SUBDIR.${MK_UTMPX}+= who SUBDIR.${MK_OFED}+= ofed