Merge ^/head r308491 through r308841.

targets/pseudo/userland/gnu/Makefile.depend

@@ -111,10 +111,6 @@ DIRDEPS = \
 	gnu/usr.bin/texinfo/makeinfo \
 	gnu/usr.bin/texinfo/texindex \
 
-.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
-DIRDEPS+=	gnu/usr.bin/binutils/objcopy
-.endif
-
 .if ${MK_GPL_DTC} != "no"
 DIRDEPS+= gnu/usr.bin/dtc
 .endif

targets/pseudo/userland/misc/Makefile.depend

@@ -58,6 +58,9 @@ DIRDEPS.x86sys+= \
 	sys/boot/i386/zfsboot \
 	sys/boot/i386/zfsloader \
 
+DIRDEPS+= \
+	sbin/zfsbootcfg \
+
 .endif
 
 DIRDEPS.amd64= \
@@ -75,6 +78,12 @@ DIRDEPS.amd64+= \
 
 .endif
 
+.if ${MK_EFI} != "no"
+DIRDEPS+= \
+	usr.sbin/efivar \
+
+.endif
+
 DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi}
 DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi}
 DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi}