Skip to content

Commit e903177

Browse files
intelfxbehlendorf
authored andcommitted
config: cleanup KERNEL_CC checks, fix broken status output
If $KERNEL_CC was not defined, configure status output would print an empty string where the kernel compiler should have been. Fix this and simplify the code generally. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ivan Shapovalov <[email protected]> Closes #16997
1 parent d247538 commit e903177

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

config/always-compiler-options.m4

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -231,20 +231,17 @@ dnl #
231231
dnl # Check if kernel cc supports -Winfinite-recursion option.
232232
dnl #
233233
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_KERNEL_CC_INFINITE_RECURSION], [
234-
AC_MSG_CHECKING([whether $KERNEL_CC supports -Winfinite-recursion])
235-
236234
saved_cc="$CC"
235+
AS_IF(
236+
[ test -n "$KERNEL_CC" ], [ CC="$KERNEL_CC" ],
237+
[ test -n "$KERNEL_LLVM" ], [ CC="clang" ],
238+
[ CC="gcc" ]
239+
)
240+
AC_MSG_CHECKING([whether $CC supports -Winfinite-recursion])
241+
237242
saved_flags="$CFLAGS"
238-
CC="gcc"
239243
CFLAGS="$CFLAGS -Werror -Winfinite-recursion"
240244
241-
AS_IF([ test -n "$KERNEL_CC" ], [
242-
CC="$KERNEL_CC"
243-
])
244-
AS_IF([ test -n "$KERNEL_LLVM" ], [
245-
CC="clang"
246-
])
247-
248245
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
249246
KERNEL_INFINITE_RECURSION=-Winfinite-recursion
250247
AC_DEFINE([HAVE_KERNEL_INFINITE_RECURSION], 1,
@@ -329,20 +326,17 @@ dnl #
329326
dnl # Check if kernel cc supports -fno-ipa-sra option.
330327
dnl #
331328
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_KERNEL_CC_NO_IPA_SRA], [
332-
AC_MSG_CHECKING([whether $KERNEL_CC supports -fno-ipa-sra])
333-
334329
saved_cc="$CC"
330+
AS_IF(
331+
[ test -n "$KERNEL_CC" ], [ CC="$KERNEL_CC" ],
332+
[ test -n "$KERNEL_LLVM" ], [ CC="clang" ],
333+
[ CC="gcc" ]
334+
)
335+
AC_MSG_CHECKING([whether $CC supports -fno-ipa-sra])
336+
335337
saved_flags="$CFLAGS"
336-
CC="gcc"
337338
CFLAGS="$CFLAGS -Werror -fno-ipa-sra"
338339
339-
AS_IF([ test -n "$KERNEL_CC" ], [
340-
CC="$KERNEL_CC"
341-
])
342-
AS_IF([ test -n "$KERNEL_LLVM" ], [
343-
CC="clang"
344-
])
345-
346340
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
347341
KERNEL_NO_IPA_SRA=-fno-ipa-sra
348342
AC_MSG_RESULT([yes])

0 commit comments

Comments
 (0)