]> granicus.if.org Git - zfs/commitdiff
Remove DEBUG_STACKFLAGS to bypass compiler error
authorTony Hutter <hutter2@llnl.gov>
Thu, 3 May 2018 21:56:28 +0000 (14:56 -0700)
committerTony Hutter <hutter2@llnl.gov>
Tue, 8 May 2018 00:19:58 +0000 (17:19 -0700)
'Support -fsanitize=address with --enable-asan' (fed9035) removed
DEBUG_STACKFLAGS="-fstack-check" from zfs-build.m4 in master.
However, that's too heavyweight a patch to merge in to the 0.7.x branch,
so just take the one-liner we need to get around a compiler error
on Fedora 28:

$ ./configure --enable-debug --enable-debuginfo && make pkg-utils
  CC       gethrtime.lo
cc1: error: '-fstack-check=' and '-fstack-clash_protection' are mutually
exclusive.  Disabling '-fstack-check=' [-Werror]

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Requires-spl: #701

config/zfs-build.m4

index 85571a8addde6bc1aee08fd36a683c39590fa0eb..5e081c237ac9849304c28f65d68fe0509d0c0576 100644 (file)
@@ -10,7 +10,6 @@ AC_DEFUN([ZFS_AC_DEBUG_ENABLE], [
        KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
        HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
        DEBUG_CFLAGS="-DDEBUG -Werror"
-       DEBUG_STACKFLAGS="-fstack-check"
        DEBUG_ZFS="_with_debug"
        AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled])
 ])