d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the MK_LIBCPLUSPLUS option

Browse Source 
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
This commit is contained in:
Alex Richardson 2021-01-30 17:56:35 +00:00
parent d6f9c5a6d2
commit 5cf6f1c4bc
11 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -2867,7 +2867,7 @@ _prereq_libs+= lib/libssp_nonshared
_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
@ -2876,7 +2876,7 @@ _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_LIBCPLUSPLUS} != "no"
.if ${MK_CXX} != "no"
lib/libcxxrt__L: lib/libgcc_s__L
.endif
@ -2925,7 +2925,7 @@ gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncurses__L
_prebuild_libs+= lib/libregex
.endif
.if ${MK_LIBCPLUSPLUS} != "no"
.if ${MK_CXX} != "no"
_prebuild_libs+= lib/libc++
.endif
@ -3089,7 +3089,7 @@ lib/libradius__L: lib/libmd__L
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

2
lib/Makefile
View File

@ -182,7 +182,7 @@ SUBDIR.${MK_STATS}+= libstats
_libclang_rt= libclang_rt
.endif
.if ${MK_LIBCPLUSPLUS} != "no"
.if ${MK_CXX} != "no"
_libcxxrt= libcxxrt
_libcplusplus= libc++
_libcplusplus+= libc++experimental

4
lib/libproc/Makefile
View File

@ -18,10 +18,8 @@ CFLAGS+= -I${.CURDIR}
.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

4
share/man/man5/src.conf.5
View File

@ -1,6 +1,6 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.\" $FreeBSD$
.Dd January 30, 2021
.Dd February 1, 2021
.Dt SRC.CONF 5
.Os
.Sh NAME
@ -859,8 +859,6 @@ runtime linker.
.Pp
This is a default setting on
arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mips, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf.
.It Va WITHOUT_LIBCPLUSPLUS
Set to avoid building libcxxrt and libc++.
.It Va WITH_LIBSOFT
On armv6 only, set to enable soft float ABI compatibility libraries.
This option is for transitioning to the new hard float ABI.

1
share/mk/bsd.libnames.mk
View File

@ -141,7 +141,6 @@ LIBSPL?= ${LIBDESTDIR}${LIBDIR_BASE}/libspl.a
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

4
share/mk/bsd.prog.mk
View File

@ -261,11 +261,7 @@ _EXTRADEPEND:
.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)

4
share/mk/src.libnames.mk
View File

@ -298,11 +298,7 @@ _DP_radius= crypto
_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

1
share/mk/src.opts.mk
View File

@ -125,7 +125,6 @@ __DEFAULT_YES_OPTIONS = \
LDNS \
LDNS_UTILS \
LEGACY_CONSOLE \
LIBCPLUSPLUS \
LLD \
LLD_BOOTSTRAP \
LLD_IS_LD \

2
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -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

2
tools/build/options/WITHOUT_LIBCPLUSPLUS
View File

@ -1,2 +0,0 @@
.\" $FreeBSD$
Set to avoid building libcxxrt and libc++.

2
tools/build/options/WITH_LIBCPLUSPLUS
View File

@ -1,2 +0,0 @@
.\" $FreeBSD$
Set to build libcxxrt and libc++.