Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
This commit is contained in:
commit
94caad0d1f
|
@ -5,9 +5,8 @@ DEFAULT_INCLUDES = -I${top_srcdir}
|
|||
#
|
||||
# FIXME: Add -Wshadow once everything is working
|
||||
#
|
||||
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror
|
||||
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-parentheses
|
||||
AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
|
||||
AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses
|
||||
AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
|
||||
|
||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||
|
|
|
@ -8,10 +8,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
|
|||
|
||||
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
|
||||
# FIXME: consider removing this as soon as we reasonably can
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror "
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused -Wno-missing-braces "
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unknown-pragmas -Wno-parentheses "
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing "
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror"
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused"
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-missing-braces -Wno-parentheses"
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing"
|
||||
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL "
|
||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" "
|
||||
|
|
|
@ -11,7 +11,8 @@ modules clean:
|
|||
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
|
||||
|
||||
modules_install:
|
||||
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
|
||||
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` \
|
||||
INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
|
||||
# Install the required headers in to the kernel source
|
||||
(mkdir -p $(DESTDIR)/@LINUX@/include/zfs && \
|
||||
find . -mindepth 3 -maxdepth 3 -name '*.h' | \
|
||||
|
|
Loading…
Reference in New Issue