From 119a28815f52b5853b483ac5e402a0e5d13b7b91 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 22 May 2009 14:49:41 -0700 Subject: [PATCH] - Update build system to SPL_META_VERSION not VERSION. - ZFS_LINUX_COMPILE_IFELSE drop explicit CC and force the kernel build system to set it this ensure -m64 is set only when appropriate. --- config/zfs-build.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 168418de4b..26d59c139d 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -117,7 +117,7 @@ AC_DEFUN([ZFS_AC_SPL], [ AC_MSG_CHECKING([spl build directory]) AC_MSG_RESULT([$splbuild]) - AC_MSG_CHECKING([spl Module.symvers]) + AC_MSG_CHECKING([spl Module{s}.symvers]) if test -r $splbuild/module/Module.symvers; then splsymvers=$splbuild/module/Module.symvers elif test -r $splbuild/module/Modules.symvers; then @@ -139,10 +139,10 @@ AC_DEFUN([ZFS_AC_SPL], [ AC_MSG_CHECKING([spl source version]) if test -r $splbuild/spl_config.h && - fgrep -q VERSION $splbuild/spl_config.h; then + fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then splsrcver=`(echo "#include "; - echo "splsrcver=VERSION") | + echo "splsrcver=SPL_META_VERSION") | cpp -I $splbuild | grep "^splsrcver=" | cut -d \" -f 2` fi @@ -290,7 +290,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [ rm -Rf build && mkdir -p build echo "obj-m := conftest.o" >build/Makefile AS_IF( - [AC_TRY_COMMAND(cp conftest.c build && make [$2] CC="$CC" LINUXINCLUDE="-Iinclude -Iinclude2 -I$LINUX/include -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], + [AC_TRY_COMMAND(cp conftest.c build && make [$2] LINUXINCLUDE="-Iinclude -Iinclude2 -I$LINUX/include -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], [$4], [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])] )