git: ed3d14a5b0d0 - stable/13 - Fix spelling of NO_WINFINITE_RECURSION.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 May 2023 00:30:05 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=ed3d14a5b0d06ef856ad66627e8c8ebce4b73830
commit ed3d14a5b0d06ef856ad66627e8c8ebce4b73830
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-12-21 22:45:29 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-05-03 00:25:58 +0000
Fix spelling of NO_WINFINITE_RECURSION.
Reported by: dim
Fixes: 2e08e4b75ea1 zfs: Fix build with GCC 12.
(cherry picked from commit 3266131908914b3a359571dae75194fe6d330c1d)
---
sys/conf/files | 2 +-
sys/conf/kern.mk | 2 +-
sys/modules/zfs/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/conf/files b/sys/conf/files
index 7c90279a261f..928289668166 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -177,7 +177,7 @@ contrib/openzfs/module/lua/lcompat.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/lua/lcorolib.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/lua/lctype.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/lua/ldebug.c optional zfs compile-with "${ZFS_C}"
-contrib/openzfs/module/lua/ldo.c optional zfs compile-with "${ZFS_C} ${NO_WINFINTE_RECURSION}"
+contrib/openzfs/module/lua/ldo.c optional zfs compile-with "${ZFS_C} ${NO_WINFINITE_RECURSION}"
contrib/openzfs/module/lua/lfunc.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/lua/lgc.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/lua/llex.c optional zfs compile-with "${ZFS_C}"
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 47f4b5c48243..25c6ad8d87ac 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -94,7 +94,7 @@ CWARNEXTRA+= -Wno-address-of-packed-member \
CWARNEXTRA+= -Wno-error=nonnull \
-Wno-dangling-pointer \
-Wno-zero-length-bounds
-NO_WINFINTE_RECURSION= -Wno-infinite-recursion
+NO_WINFINITE_RECURSION= -Wno-infinite-recursion
NO_WSTRINGOP_OVERREAD= -Wno-stringop-overread
.endif
.endif
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 9259a5f7e182..0cfc336aacb1 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -292,7 +292,7 @@ CFLAGS.gcc+= -Wno-pointer-to-int-cast
CFLAGS.lapi.c= -Wno-cast-qual
CFLAGS.lcompat.c= -Wno-cast-qual
-CFLAGS.ldo.c= ${NO_WINFINTE_RECURSION}
+CFLAGS.ldo.c= ${NO_WINFINITE_RECURSION}
CFLAGS.lobject.c= -Wno-cast-qual
CFLAGS.ltable.c= -Wno-cast-qual
CFLAGS.lvm.c= -Wno-cast-qual