diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-11-19 16:05:55 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-11-19 16:05:55 +0000 |
| commit | 67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d (patch) | |
| tree | 7d222a83de8d7e5d1465e33f3c24660799770c92 /targets/pseudo | |
| parent | 2828dafcf3e7b225b70cbb380eb8c7dae452493e (diff) | |
| parent | 57b28934e964b15f1fcd91734c6dbef762222079 (diff) | |
| download | src-67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d.tar.gz src-67bc8c8b9e69bc53221a9bd914e418d81d6cdc7d.zip | |
Merge ^/head r308491 through r308841.
Notes
Notes:
svn path=/projects/clang390-import/; revision=308842
Diffstat (limited to 'targets/pseudo')
| -rw-r--r-- | targets/pseudo/userland/gnu/Makefile.depend | 4 | ||||
| -rw-r--r-- | targets/pseudo/userland/misc/Makefile.depend | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend index 5c6581b8f2d9..cb9bda628cfc 100644 --- a/targets/pseudo/userland/gnu/Makefile.depend +++ b/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 diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend index a4091cc1d76f..fc2a9ca01be9 100644 --- a/targets/pseudo/userland/misc/Makefile.depend +++ b/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} |