diff options
| author | Brian Behlendorf <[email protected]> | 2011-06-14 15:09:05 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-06-14 16:40:35 -0700 |
| commit | 2e08aedba456dccddf6418908a55014e56cad226 (patch) | |
| tree | a75555bfa4b1760023fb1620cb843b53376d936e /config | |
| parent | 8a7e1ceefa430988c8f888ca708ab307333b4464 (diff) | |
Always check -Wno-unused-but-set-variable gcc support
The previous commit 8a7e1ceefa430988c8f888ca708ab307333b4464 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.
Diffstat (limited to 'config')
| -rw-r--r-- | config/always-no-unused-but-set-variable.m4 (renamed from config/user-no-unused-but-set-variable.m4) | 2 | ||||
| -rw-r--r-- | config/user.m4 | 1 | ||||
| -rw-r--r-- | config/zfs-build.m4 | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/config/user-no-unused-but-set-variable.m4 b/config/always-no-unused-but-set-variable.m4 index ebe4a7594..0e2634da2 100644 --- a/config/user-no-unused-but-set-variable.m4 +++ b/config/always-no-unused-but-set-variable.m4 @@ -6,7 +6,7 @@ dnl # and infer the 'no-' version does or doesn't exist based upon dnl # the results. This is required because when checking any of dnl # no- prefixed options gcc always returns success. dnl # -AC_DEFUN([ZFS_AC_CONFIG_USER_NO_UNUSED_BUT_SET_VARIABLE], [ +AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE], [ AC_MSG_CHECKING([for -Wno-unused-but-set-variable support]) saved_flags="$CFLAGS" diff --git a/config/user.m4 b/config/user.m4 index d12633f39..a79deefe8 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -9,6 +9,5 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ ZFS_AC_CONFIG_USER_LIBBLKID ZFS_AC_CONFIG_USER_LIBSELINUX ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN - ZFS_AC_CONFIG_USER_NO_UNUSED_BUT_SET_VARIABLE ZFS_AC_CONFIG_USER_STACK_GUARD ]) diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 773a9448c..e048596de 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -33,6 +33,10 @@ AC_DEFUN([ZFS_AC_DEBUG], [ AC_MSG_RESULT([$enable_debug]) ]) +AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [ + ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE +]) + AC_DEFUN([ZFS_AC_CONFIG], [ TARGET_ASM_DIR=asm-generic AC_SUBST(TARGET_ASM_DIR) @@ -47,6 +51,8 @@ AC_DEFUN([ZFS_AC_CONFIG], [ AC_MSG_RESULT([$ZFS_CONFIG]); AC_SUBST(ZFS_CONFIG) + ZFS_AC_CONFIG_ALWAYS + case "$ZFS_CONFIG" in kernel) ZFS_AC_CONFIG_KERNEL ;; user) ZFS_AC_CONFIG_USER ;; |