Retire BINUTILS and BINUTILS_BOOTSTRAP options

As of r361857 all BINUTILS options are disabled by default - ports
have been changed to depend on binutils if they require GNU as, and
all base system assembly files have been switched to use Clang's
integrated assembler.

Relnotes:	Yes
Sponsored by:	The FreeBSD Foundation

2 files changed, 1 insertions, 18 deletions

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index c642b83a61db..e669f3a36c9b 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -2,15 +2,10 @@
 
 .include <src.opts.mk>
 
-
-.if ${MK_GDB} != "no" || ${MK_BINUTILS} != "no"
-SUBDIR+=	binutils
-.endif
-
 SUBDIR.${MK_DIALOG}+=	dialog
 SUBDIR.${MK_GNU_DIFF}+=	diff3
 SUBDIR.${MK_GNU_GREP}+=	grep
-SUBDIR.${MK_GDB}+=	gdb
+SUBDIR.${MK_GDB}+=	binutils gdb
 SUBDIR_DEPEND_gdb=	binutils
 SUBDIR.${MK_TESTS}+=	tests
 
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index 7eacb9851047..eccbf31ef925 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -6,18 +6,6 @@ SUBDIR=	libiberty \
 	libbfd \
 	libopcodes
 
-SUBDIR.${MK_BINUTILS}+=	doc
-
-# GNU as is used on x86 only, for a few files that cannot be assembled by
-# Clang IAS. Other archs either use Clang IAS for every assembly file, or
-# use external toolchain.
-.if (${TARGET} == "amd64" || ${TARGET} == "i386") && \
-    (${MK_BINUTILS} != "no" || ${MK_BINUTILS_BOOTSTRAP} != "no")
-SUBDIR+=	as
-.endif
-
-SUBDIR_DEPEND_as=libbfd libiberty libopcodes
-
 .if !make(install)
 SUBDIR_PARALLEL=
 .endif