From: Matthew Thode <mthode@mthode.org>
Date: Fri, 12 Jan 2018 17:39:36 +0000 (+0000)
Subject: Fix copy-builtin to work with ASAN patch
X-Git-Tag: zfs-0.8.0~806
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c10cdcb55f81ea773486161b31bc91bb7b58b4c8;p=mirror_zfs.git

Fix copy-builtin to work with ASAN patch

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
---

diff --git a/copy-builtin b/copy-builtin
index d04314bb3..795025b38 100755
--- a/copy-builtin
+++ b/copy-builtin
@@ -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