Skip to content

Commit

Permalink
Fix copy-builtin to work with ASAN patch
Browse files Browse the repository at this point in the history
Commit fed9035 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
  • Loading branch information
prometheanfire authored and behlendorf committed Jan 12, 2018
1 parent e1a0850 commit c10cdcb
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions copy-builtin
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c10cdcb

Please sign in to comment.