aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@FreeBSD.org>2019-11-02 20:46:45 +0000
committerToomas Soome <tsoome@FreeBSD.org>2019-11-02 20:46:45 +0000
commita524707b9b2ff476e67a2b68847df37a47728dc1 (patch)
tree409bc0bbac0f4ba89df0b14d5905d7aa5323bb8b
parentec0db2d748dc735a8260917254e7a00a11d070e1 (diff)
downloadsrc-a524707b9b2ff476e67a2b68847df37a47728dc1.tar.gz
src-a524707b9b2ff476e67a2b68847df37a47728dc1.zip
r354253 did miss the updates to sys/conf/files and sys/conf/kern.pre.mk
Reported by: Brandon Bergren
Notes
Notes: svn path=/head/; revision=354264
-rw-r--r--sys/conf/files2
-rw-r--r--sys/conf/kern.pre.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 4bc5770e08cd..152ced46592a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -152,6 +152,7 @@ cddl/compat/opensolaris/kern/opensolaris_vm.c optional zfs compile-with "${ZF
cddl/compat/opensolaris/kern/opensolaris_zone.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/acl/acl_common.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/avl/avl.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/lz4/lz4.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/nvpair/opensolaris_fnvpair.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}"
@@ -202,7 +203,6 @@ cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c optional zfs compile-wit
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c optional zfs compile-with "${ZFS_C}"
-cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/multilist.c optional zfs compile-with "${ZFS_C}"
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 70af0262d2c7..9319fa037586 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -197,6 +197,7 @@ CDDL_C= ${CC} -c ${CDDL_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
ZFS_CFLAGS= -DBUILDING_ZFS -I$S/cddl/contrib/opensolaris/uts/common/fs/zfs
ZFS_CFLAGS+= -I$S/cddl/contrib/opensolaris/uts/common/fs/zfs/lua
ZFS_CFLAGS+= -I$S/cddl/contrib/opensolaris/uts/common/zmod
+ZFS_CFLAGS+= -I$S/cddl/contrib/opensolaris/common/lz4
ZFS_CFLAGS+= -I$S/cddl/contrib/opensolaris/common/zfs
ZFS_CFLAGS+= ${CDDL_CFLAGS}
ZFS_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${ZFS_CFLAGS}