diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2021-01-30 17:56:35 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2021-02-01 09:32:07 +0000 |
| commit | 5cf6f1c4bc281ac45ced086bc2e393f732f2fcc2 (patch) | |
| tree | e5b938dc5168ca455114f416951199aee1a4140c /share | |
| parent | d6f9c5a6d2f87865f9714d2b8dfd1a9f3080c71e (diff) | |
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/src.conf.5 | 4 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 4 | ||||
| -rw-r--r-- | share/mk/src.libnames.mk | 4 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 1 |
5 files changed, 1 insertions, 13 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 0e853db0d1bc..81656db323ed 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -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. diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index d030292d3c5e..7f591d3fd3f7 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -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 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 5e7aaaeb37f8..44a774957cfb 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -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) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 32cd1677bcd4..1d3195f53eb1 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -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 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index e531916b5976..d3f7e33f276c 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -125,7 +125,6 @@ __DEFAULT_YES_OPTIONS = \ LDNS \ LDNS_UTILS \ LEGACY_CONSOLE \ - LIBCPLUSPLUS \ LLD \ LLD_BOOTSTRAP \ LLD_IS_LD \ |