Merge ^/head r286697 through r286857.

4 files changed, 22 insertions, 43 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 2ae3054..5192807 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -184,7 +184,7 @@ OLD_DIRS+=usr/share/examples/bhyve
 .if ${MK_BINUTILS} == no
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
 OLD_FILES+=usr/bin/objcopy
 .endif
 OLD_FILES+=usr/bin/objdump
@@ -203,7 +203,7 @@ OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.1.gz
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 .endif
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
@@ -1663,29 +1663,6 @@ OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no || \
-    (${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} != no)
-OLD_FILES+=usr/bin/elfcopy
-OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
-.endif
-
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no
-OLD_FILES+=usr/bin/addr2line
-OLD_FILES+=usr/bin/c++filt
-OLD_FILES+=usr/bin/nm
-OLD_FILES+=usr/bin/readelf
-OLD_FILES+=usr/bin/size
-OLD_FILES+=usr/bin/strings
-OLD_FILES+=usr/bin/strip
-OLD_FILES+=usr/share/man/man1/addr2line.1.gz
-OLD_FILES+=usr/share/man/man1/c++filt.1.gz
-OLD_FILES+=usr/share/man/man1/nm.1.gz
-OLD_FILES+=usr/share/man/man1/readelf.1.gz
-OLD_FILES+=usr/share/man/man1/size.1.gz
-OLD_FILES+=usr/share/man/man1/strings.1.gz
-OLD_FILES+=usr/share/man/man1/strip.1.gz
-.endif
-
 #.if ${MK_EXAMPLES} == no
 # to be filled in
 #.endif
@@ -7545,9 +7522,26 @@ OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/ul.1.gz
 .endif
 
-#.if ${MK_TOOLCHAIN} == no
-# to be filled in
-#.endif
+.if ${MK_TOOLCHAIN} == no
+OLD_FILES+=usr/bin/addr2line
+OLD_FILES+=usr/bin/c++filt
+OLD_FILES+=usr/bin/nm
+OLD_FILES+=usr/bin/readelf
+OLD_FILES+=usr/bin/size
+OLD_FILES+=usr/bin/strings
+OLD_FILES+=usr/bin/strip
+OLD_FILES+=usr/share/man/man1/addr2line.1.gz
+OLD_FILES+=usr/share/man/man1/c++filt.1.gz
+OLD_FILES+=usr/share/man/man1/nm.1.gz
+OLD_FILES+=usr/share/man/man1/readelf.1.gz
+OLD_FILES+=usr/share/man/man1/size.1.gz
+OLD_FILES+=usr/share/man/man1/strings.1.gz
+OLD_FILES+=usr/share/man/man1/strip.1.gz
+.endif
+.if ${MK_TOOLCHAIN} == no || ${MK_ELFCOPY_AS_OBJCOPY} != no
+OLD_FILES+=usr/bin/elfcopy
+OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
+.endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
diff --git a/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS b/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
deleted file mode 100644
index e30f48d..0000000
--- a/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
+++ /dev/null
@@ -1,10 +0,0 @@
-.\" $FreeBSD$
-Set to avoid building ELF Tool Chain tools
-.Xr addr2line 1 ,
-.Xr c++filt 1 ,
-.Xr nm 1 ,
-.Xr readelf 1 ,
-.Xr size 1 ,
-.Xr strings 1 ,
-and
-.Xr strip 1 .
diff --git a/tools/build/options/WITHOUT_SYSINSTALL b/tools/build/options/WITHOUT_SYSINSTALL
deleted file mode 100644
index 60426e3..0000000
--- a/tools/build/options/WITHOUT_SYSINSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to not build
-.Xr sysinstall 8
-and related programs.
diff --git a/tools/tools/nanobsd/gateworks/common b/tools/tools/nanobsd/gateworks/common
index 8cedf38..bc38e99 100644
--- a/tools/tools/nanobsd/gateworks/common
+++ b/tools/tools/nanobsd/gateworks/common
@@ -147,7 +147,6 @@ WITHOUT_SENDMAIL=true
 WITHOUT_SHAREDOCS=true
 WITHOUT_SSP=true
 WITHOUT_SYSCONS=true
-WITHOUT_SYSINSTALL=true
 WITHOUT_TCSH=true
 WITHOUT_TFTPD=true
 WITHOUT_ZFS=true