mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
Always check -Wno-unused-but-set-variable gcc support
The previous commit 8a7e1ceefa wasn't
quite right. This check applies to both the user and kernel space
build and as such we must make sure it runs regardless of what
the --with-config option is set too.
For example, if --with-config=kernel then the autoconf test does
not run and we generate build warnings when compiling the kernel
packages.
This commit is contained in:
+1
-1
@@ -38,6 +38,7 @@ subdir = cmd
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -70,7 +71,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -41,6 +41,7 @@ sbin_PROGRAMS = mount.zfs$(EXEEXT)
|
||||
subdir = cmd/mount_zfs
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
+1
-1
@@ -41,6 +41,7 @@ sbin_PROGRAMS = zdb$(EXEEXT)
|
||||
subdir = cmd/zdb
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
+1
-1
@@ -41,6 +41,7 @@ sbin_PROGRAMS = zfs$(EXEEXT)
|
||||
subdir = cmd/zfs
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -41,6 +41,7 @@ sbin_PROGRAMS = zinject$(EXEEXT)
|
||||
subdir = cmd/zinject
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -41,6 +41,7 @@ sbin_PROGRAMS = zpios$(EXEEXT)
|
||||
subdir = cmd/zpios
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -41,6 +41,7 @@ sbin_PROGRAMS = zpool$(EXEEXT)
|
||||
subdir = cmd/zpool
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -40,6 +40,7 @@ DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -72,7 +73,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -40,6 +40,7 @@ DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -72,7 +73,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -41,6 +41,7 @@ sbin_PROGRAMS = ztest$(EXEEXT)
|
||||
subdir = cmd/ztest
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
@@ -41,6 +41,7 @@ bin_PROGRAMS = zvol_id$(EXEEXT)
|
||||
subdir = cmd/zvol_id
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
|
||||
$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
|
||||
$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
|
||||
@@ -73,7 +74,6 @@ am__aclocal_m4_deps = \
|
||||
$(top_srcdir)/config/user-ioctl.m4 \
|
||||
$(top_srcdir)/config/user-libblkid.m4 \
|
||||
$(top_srcdir)/config/user-libuuid.m4 \
|
||||
$(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
|
||||
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
|
||||
$(top_srcdir)/config/user-selinux.m4 \
|
||||
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
|
||||
|
||||
Reference in New Issue
Block a user