talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
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/csu
_startup_libs+= lib/libc _startup_libs+= lib/libc
_startup_libs+= lib/libc_nonshared _startup_libs+= lib/libc_nonshared
.if ${MK_LIBCPLUSPLUS} != "no" .if ${MK_CXX} != "no"
_startup_libs+= lib/libcxxrt _startup_libs+= lib/libcxxrt
.endif .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__L
lib/libgcc_s__L: lib/libc_nonshared__L lib/libgcc_s__L: lib/libc_nonshared__L
.if ${MK_LIBCPLUSPLUS} != "no" .if ${MK_CXX} != "no"
lib/libcxxrt__L: lib/libgcc_s__L lib/libcxxrt__L: lib/libgcc_s__L
.endif .endif
@ -2925,7 +2925,7 @@ gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncurses__L
_prebuild_libs+= lib/libregex _prebuild_libs+= lib/libregex
.endif .endif
.if ${MK_LIBCPLUSPLUS} != "no" .if ${MK_CXX} != "no"
_prebuild_libs+= lib/libc++ _prebuild_libs+= lib/libc++
.endif .endif
@ -3089,7 +3089,7 @@ lib/libradius__L: lib/libmd__L
lib/libproc__L: \ lib/libproc__L: \
${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__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 lib/libproc__L: lib/libcxxrt__L
.endif .endif

2
lib/Makefile
View File

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

4
lib/libproc/Makefile
View File

@ -18,10 +18,8 @@ CFLAGS+= -I${.CURDIR}
.if ${MK_CXX} == "no" .if ${MK_CXX} == "no"
CFLAGS+= -DNO_CXA_DEMANGLE CFLAGS+= -DNO_CXA_DEMANGLE
.elif ${MK_LIBCPLUSPLUS} != "no"
LIBADD+= cxxrt
.else .else
LIBADD+= supcplusplus LIBADD+= cxxrt
.endif .endif
LIBADD+= elf procstat rtld_db util 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. .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.\" $FreeBSD$ .\" $FreeBSD$
.Dd January 30, 2021 .Dd February 1, 2021
.Dt SRC.CONF 5 .Dt SRC.CONF 5
.Os .Os
.Sh NAME .Sh NAME
@ -859,8 +859,6 @@ runtime linker.
.Pp .Pp
This is a default setting on This is a default setting on
arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mips, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. 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 .It Va WITH_LIBSOFT
On armv6 only, set to enable soft float ABI compatibility libraries. On armv6 only, set to enable soft float ABI compatibility libraries.
This option is for transitioning to the new hard float ABI. 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 LIBSSL?= ${LIBDESTDIR}${LIBDIR_BASE}/libssl.a
LIBSSP_NONSHARED?= ${LIBDESTDIR}${LIBDIR_BASE}/libssp_nonshared.a LIBSSP_NONSHARED?= ${LIBDESTDIR}${LIBDIR_BASE}/libssp_nonshared.a
LIBSTATS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstats.a LIBSTATS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstats.a
LIBSTDCPLUSPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdc++.a
LIBSTDTHREADS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdthreads.a LIBSTDTHREADS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdthreads.a
LIBSYSDECODE?= ${LIBDESTDIR}${LIBDIR_BASE}/libsysdecode.a LIBSYSDECODE?= ${LIBDESTDIR}${LIBDIR_BASE}/libsysdecode.a
LIBTACPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libtacplus.a LIBTACPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libtacplus.a

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

@ -261,11 +261,7 @@ _EXTRADEPEND:
.else .else
echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE} echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
.if defined(PROG_CXX) .if defined(PROG_CXX)
.if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++)
echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE} echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
.else
echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
.endif
.endif .endif
.endif .endif
.endif # !defined(NO_EXTRADEPEND) .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_rtld_db= elf procstat
_DP_procstat= kvm util elf _DP_procstat= kvm util elf
.if ${MK_CXX} == "yes" .if ${MK_CXX} == "yes"
.if ${MK_LIBCPLUSPLUS} != "no"
_DP_proc= cxxrt _DP_proc= cxxrt
.else
_DP_proc= supcplusplus
.endif
.endif .endif
.if ${MK_CDDL} != "no" .if ${MK_CDDL} != "no"
_DP_proc+= ctf _DP_proc+= ctf

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

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

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

@ -3793,7 +3793,7 @@ OLD_LIBS+=${DEBUG_LIB32_LIBS}
. endif . endif
.endif .endif
.if ${MK_LIBCPLUSPLUS} == no .if ${MK_CXX} == no
OLD_LIBS+=lib/libcxxrt.so.1 OLD_LIBS+=lib/libcxxrt.so.1
OLD_FILES+=usr/lib/libc++.a OLD_FILES+=usr/lib/libc++.a
OLD_FILES+=usr/lib/libc++_p.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++.