diff options
| author | Warner Losh <imp@FreeBSD.org> | 2018-07-08 07:42:49 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2018-07-08 07:42:49 +0000 |
| commit | b8902de147f46c9dcf7f54711b47d6b512fc5c1c (patch) | |
| tree | fa3a2c4e2729979c2818fd45db73a3762acea3b8 /stand/efi/boot1/Makefile | |
| parent | 9d6c74a0d9d1805ad9fcd7ff702aa52ba42cd497 (diff) | |
| download | src-b8902de147f46c9dcf7f54711b47d6b512fc5c1c.tar.gz src-b8902de147f46c9dcf7f54711b47d6b512fc5c1c.zip | |
Move ZFS files into libsa
Move the libzfs stuff into libsa. There's no need for it to be a
separate library. The separate library adds to the issues of build
ordering that we see from time to time. Move the filesystem support
into libsa, like all the other filesystem support rather than making
zfs the odd-duck out.
Discussed with: allanjude@
Notes
Notes:
svn path=/head/; revision=336084
Diffstat (limited to 'stand/efi/boot1/Makefile')
| -rw-r--r-- | stand/efi/boot1/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index 02ca94705361..992afd5fc1d2 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -30,7 +30,6 @@ CFLAGS.zfs_module.c+= -I${ZFSSRC} CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs CFLAGS.zfs_module.c+= -I${SYSDIR}/crypto/skein CFLAGS+= -DEFI_ZFS_BOOT -LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201 @@ -72,8 +71,8 @@ LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a # __aeabi_* (arm) or __divdi3 (i386). # as well as required string and memory functions for all platforms. # -DPADD+= ${LIBEFI} ${LIBZFSBOOT} ${LIBSA} -LDADD+= ${LIBEFI} ${LIBZFSBOOT} ${LIBSA} +DPADD+= ${LIBEFI} ${LIBSA} +LDADD+= ${LIBEFI} ${LIBSA} DPADD+= ${LDSCRIPT} |