aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Thode <[email protected]>2018-01-12 17:39:36 +0000
committerBrian Behlendorf <[email protected]>2018-01-12 09:39:36 -0800
commitc10cdcb55f81ea773486161b31bc91bb7b58b4c8 (patch)
treeec98907304835cc774a0aca26580ad4e34320792
parente1a0850c3570ae53df5779bc656f17b98b86f160 (diff)
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 <[email protected]> Signed-off-by: Matthew Thode <[email protected]> Closes #7033 Closes #7037
-rwxr-xr-xcopy-builtin6
1 files changed, 4 insertions, 2 deletions
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