diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-11-16 14:20:39 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-01-27 02:13:16 +0000 |
| commit | ac4c695ad61e81d00cff2a03202a4afe94a92513 (patch) | |
| tree | 41706ae65ed1a337f8e47ccc92b9f4252040435a /Makefile.inc1 | |
| parent | 9d2f9798175586bdcd3423443804fbbc0cffb8d2 (diff) | |
| download | src-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 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6435cadbd45c..dac412559716 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2922,18 +2922,14 @@ _prereq_libs+= lib/libclang_rt/ubsan_standalone_cxx _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} \ @@ -2945,6 +2941,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ + lib/libc++ \ lib/libelf lib/libexpat \ lib/libfigpar \ ${_lib_libgssapi} \ @@ -2982,10 +2979,6 @@ gnu/lib/libdialog__L: lib/msun__L lib/ncurses/tinfo__L lib/ncurses/ncurses__L _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 @@ -3150,10 +3143,8 @@ lib/libradius__L: lib/libmd__L .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 |