git: c5bb7c22ba40 - stable/13 - stand: Don't reuse ZFSSRC
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Jan 2023 22:10:40 UTC
The branch stable/13 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c5bb7c22ba4075fece3662a77b77cd4534b72ea7
commit c5bb7c22ba4075fece3662a77b77cd4534b72ea7
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-08 15:03:45 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-01-24 21:49:22 +0000
stand: Don't reuse ZFSSRC
ZFSSRC is the top level directory where the ZFS sources come from. Don't
reuse it for a list of ZFS sources. Instead, use ZFS_SRC
Sponsored by: Netflix
(cherry picked from commit f424b167a317b37ba7626e11002ca00dcc03f661)
---
stand/libsa/zfs/Makefile.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc
index 00839c05d37d..b503f6d20e86 100644
--- a/stand/libsa/zfs/Makefile.inc
+++ b/stand/libsa/zfs/Makefile.inc
@@ -4,10 +4,10 @@
.PATH: ${SYSDIR}/crypto/skein
.PATH: ${ZFSOSSRC}/spl
.PATH: ${OZFS}/module/zstd/lib
-ZFSSRC= zfs.c nvlist.c skein.c skein_block.c list.c
-ZFSSRC+= zstd_shim.c zstd.c
+ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c
+ZFS_SRC+= zstd_shim.c zstd.c
CFLAGS+= -DHAS_ZSTD_ZFS
-SRCS+= ${ZFSSRC}
+SRCS+= ${ZFS_SRC}
CFLAGS+= -I${LDRSRC}
CFLAGS+= -I${SYSDIR}/cddl/boot/zfs
@@ -17,7 +17,7 @@ ZFS_EARLY= -I${ZFSOSINC} \
-I${ZFSOSINC}/spl \
-I${ZFSOSINC}/zfs
-.for i in ${ZFSSRC}
+.for i in ${ZFS_SRC}
CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h
.endfor