]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix copy-builtin to work with ASAN patch
authorMatthew Thode <mthode@mthode.org>
Fri, 12 Jan 2018 17:39:36 +0000 (17:39 +0000)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 12 Jan 2018 17:39:36 +0000 (09:39 -0800)
Commit fed90353 didn't fully update the copy-builtin script
as needed to perform in-kernel builds.  Add the missing
options and flags.

Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matthew Thode <mthode@mthode.org>
Closes #7033
Closes #7037

copy-builtin

index d04314bb362f0350fa6a748173507dd07d361651..795025b380118ab0ef059c6169f3ab9c80bc6c1b 100755 (executable)
@@ -63,8 +63,10 @@ EOF
        ZFS_MODULE_CFLAGS += -I$(srctree)/include/spl
        ZFS_MODULE_CFLAGS += -include $(srctree)/spl_config.h
        ZFS_MODULE_CFLAGS += -include $(srctree)/zfs_config.h
-       ZFS_MODULE_CLFAGS += -std=gnu99
-       export ZFS_MODULE_CFLAGS
+       ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
+       ZFS_MODULE_CPPFLAGS  = -DHAVE_SPL -D_KERNEL
+       ZFS_MODULE_CPPFLAGS += -UDEBUG -DNDEBUG
+       export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS
 
        obj-$(CONFIG_ZFS) :=
        EOF