git: 3dfd18a769df - main - Remove support for the base/* toolchain ports.

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=3dfd18a769dfee663cd3d5e6eba05bfe8c1d0e2e

commit 3dfd18a769dfee663cd3d5e6eba05bfe8c1d0e2e
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-02-13 21:16:24 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-02-13 21:16:24 +0000

    Remove support for the base/* toolchain ports.
    
    These ports have been removed so these knobs are no longer meaningful.
    
    This reverts commit 608289394f655d0635c71233248b734010fb4d2f.
    This reverts commit 39eb07f172921a581ee9b33ca2765905f4235202.
    
    Reviewed by:    imp, bapt, emaste
    Differential Revision:  https://reviews.freebsd.org/D38562
---
 Makefile.inc1                            | 2 --
 ObsoleteFiles.inc                        | 4 ----
 tools/build/mk/OptionalObsoleteFiles.inc | 4 +---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index c6f0269f8885..3399e469ea02 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -67,8 +67,6 @@ TIME_ENV ?= time env
 .if defined(CROSS_TOOLCHAIN)
 .if exists(${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk)
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
-.elif exists(/usr/share/toolchains/${CROSS_TOOLCHAIN}.mk)
-.include "/usr/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 .elif exists(${CROSS_TOOLCHAIN})
 .include "${CROSS_TOOLCHAIN}"
 .else
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 59941a50b7d6..2f676ae41e14 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -6382,7 +6382,6 @@ OLD_FILES+=usr/share/man/man9/sglist_count_mb_ext_pgs.9.gz
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
 
 # 20200606: retire binutils build infrastructure
-.if !defined(WITH_PORT_BASE_BINUTILS)
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/share/man/man1/as.1.gz
@@ -6391,7 +6390,6 @@ OLD_FILES+=usr/share/man/man7/as.7.gz
 OLD_FILES+=usr/share/man/man7/ld.7.gz
 OLD_FILES+=usr/share/man/man7/ldint.7.gz
 OLD_FILES+=usr/share/man/man7/binutils.7.gz
-.endif
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
@@ -7191,12 +7189,10 @@ OLD_FILES+=usr/share/man/man4/bktr.4.gz
 OLD_FILES+=usr/share/man/man4/brooktree.4.gz
 
 # 20200229: GCC 4.2.1 removed
-.if !defined(WITH_PORT_BASE_GCC)
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
-.endif
 OLD_FILES+=usr/bin/gcpp
 OLD_FILES+=usr/bin/gperf
 OLD_FILES+=usr/include/c++/4.2/algorithm
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index a6b9532fa2f8..b0a425aad67d 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -201,12 +201,10 @@ OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
 OLD_DIRS+=usr/share/examples/bhyve
 .endif
 
-.if !defined(WITH_PORT_BASE_BINUTILS)
 .if ${MK_LLD_IS_LD} == no
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/share/man/man1/ld.1.gz
 .endif
-.endif
 
 .if ${MK_BLACKLIST} == no
 OLD_FILES+=etc/blacklistd.conf
@@ -2113,7 +2111,7 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
-.if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC)
+.if ${MK_LLVM_COV} == no
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif