Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix CONFIG_MODULES=no Linux kernel config 

When configuring as builtin (--enable-linux-builtin) for kernels
without loadable module support (CONFIG_MODULES=n) only the object
file is created.  Never a loadable kmod.

Update ZFS_LINUX_TRY_COMPILE to handle this in a manor similar to
the ZFS_LINUX_TEST_COMPILE_ALL macro.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9887
Closes #10063
This commit is contained in:
Brian Behlendorf 2020-02-28 09:23:48 -08:00 committed by Tony Hutter
parent 49f065d5a4
commit 13bfad0c96
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/kernel.m4
View File

@ -811,11 +811,20 @@ dnl # $2 - source
dnl # $3 - run on success (valid .ko generated) dnl # $3 - run on success (valid .ko generated)
dnl # $4 - run on failure (unable to compile) dnl # $4 - run on failure (unable to compile)
dnl # dnl #
dnl # When configuring as builtin (--enable-linux-builtin) for kernels
dnl # without loadable module support (CONFIG_MODULES=n) only the object
dnl # file is created. See ZFS_LINUX_TEST_COMPILE_ALL for details.
dnl #
AC_DEFUN([ZFS_LINUX_TRY_COMPILE], [ AC_DEFUN([ZFS_LINUX_TRY_COMPILE], [
ZFS_LINUX_COMPILE_IFELSE( AS_IF([test "x$enable_linux_builtin" = "xyes"], [
[ZFS_LINUX_TEST_PROGRAM([[$1]], [[$2]])], ZFS_LINUX_COMPILE_IFELSE(
[test -f build/conftest/conftest.ko], [ZFS_LINUX_TEST_PROGRAM([[$1]], [[$2]])],
[$3], [$4]) [test -f build/conftest/conftest.o], [$3], [$4])
], [
ZFS_LINUX_COMPILE_IFELSE(
[ZFS_LINUX_TEST_PROGRAM([[$1]], [[$2]])],
[test -f build/conftest/conftest.ko], [$3], [$4])
])
]) ])
dnl # dnl #