Skip to content

Commit e56d15e

Browse files
asomerslundman
authored andcommitted
Fix --enable-invariants on FreeBSD
The make symbols were never getting forwarded to the correct make subprocess. As far as I can tell, this has never worked. Either that, or something has changed in the behavior of make. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Alan Somers <asomers@gmail.com> Closes openzfs#18131
1 parent 7a65eed commit e56d15e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

module/Makefile.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ check:
1919
cppcheck cppcheck-Linux cppcheck-FreeBSD
2020

2121
# For FreeBSD, use debug options from ./configure if not overridden.
22-
export WITH_DEBUG ?= @WITH_DEBUG@
23-
export WITH_INVARIANTS ?= @WITH_INVARIANTS@
22+
WITH_DEBUG ?= @WITH_DEBUG@
23+
WITH_INVARIANTS ?= @WITH_INVARIANTS@
2424

2525
# Filter out options that FreeBSD make doesn't understand
2626
getflags = ( \
@@ -43,6 +43,7 @@ done; \
4343
echo $$fmakeflags \
4444
)
4545
FMAKEFLAGS = -C @abs_srcdir@ -f Makefile.bsd $(shell $(getflags))
46+
FMAKEFLAGS += WITH_DEBUG=$(WITH_DEBUG) WITH_INVARIANTS=$(WITH_INVARIANTS)
4647

4748
ifneq (@abs_srcdir@,@abs_builddir@)
4849
FMAKEFLAGS += MAKEOBJDIR=@abs_builddir@

0 commit comments

Comments
 (0)