diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-03-14 01:23:51 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-03-14 01:32:14 +0000 |
| commit | 9db44a8e5da9bf1ce6dd1c0f1468ddafed6d6c91 (patch) | |
| tree | 773094eb34c30390e902748ef1ca381665a2ae73 /sys/contrib/openzfs/module/Makefile.in | |
| parent | a9275d996c229a30879baa42a6d02d24663ac43b (diff) | |
| parent | 9162a1ce3ae9158ae75ab1835e30ac14d3b6899c (diff) | |
| download | src-9db44a8e5da9bf1ce6dd1c0f1468ddafed6d6c91.tar.gz src-9db44a8e5da9bf1ce6dd1c0f1468ddafed6d6c91.zip | |
zfs: merge OpenZFS master-9305ff2ed
Notable upstream pull request merges:
#11153 Scalable teardown lock for FreeBSD
#11651 Don't bomb out when using keylocation=file://
#11667 zvol: call zil_replaying() during replay
#11683 abd_get_offset_struct() may allocate new abd
#11693 Intentionally allow ZFS_READONLY in zfs_write
#11716 zpool import cachefile improvements
#11720 FreeBSD: Clean up zfsdev_close to match Linux
#11730 FreeBSD: bring back possibility to rewind the
checkpoint from bootloader
Obtained from: OpenZFS
MFC after: 2 weeks
Diffstat (limited to 'sys/contrib/openzfs/module/Makefile.in')
| -rw-r--r-- | sys/contrib/openzfs/module/Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/module/Makefile.in b/sys/contrib/openzfs/module/Makefile.in index 69caf48570e9..089b3ff88490 100644 --- a/sys/contrib/openzfs/module/Makefile.in +++ b/sys/contrib/openzfs/module/Makefile.in @@ -17,6 +17,10 @@ check: modules_uninstall modules_uninstall-Linux modules_uninstall-FreeBSD \ cppcheck cppcheck-Linux cppcheck-FreeBSD +# For FreeBSD, use debug options from ./configure if not overridden. +export WITH_DEBUG ?= @WITH_DEBUG@ +export WITH_INVARIANTS ?= @WITH_INVARIANTS@ + # Filter out options that FreeBSD make doesn't understand getflags = ( \ set -- \ @@ -42,6 +46,7 @@ FMAKEFLAGS = -C @abs_srcdir@ -f Makefile.bsd $(shell $(getflags)) ifneq (@abs_srcdir@,@abs_builddir@) FMAKEFLAGS += MAKEOBJDIR=@abs_builddir@ endif + FMAKE = env -u MAKEFLAGS make $(FMAKEFLAGS) modules-Linux: |