summaryrefslogtreecommitdiffstats
path: root/copy-builtin
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2017-03-27 12:31:15 -0700
committerGitHub <[email protected]>2017-03-27 12:31:15 -0700
commit06480b2790e4a07fefa5a2bbaaf1e26d1eb00d33 (patch)
tree27ad184b8c8aa5a843f3806832e40e851eb393df /copy-builtin
parent7b0dc2a317a3d149d396bc48dae7b8e9bf1a1a6b (diff)
Allow c99 when building ZFS in the kernel tree
Commit 4a5d7f82 enabled building c99 out of the kernel tree. However, when building as part of the kernel different Makefiles are used and -std=gnu99 must additionially be added there. Reviewed-by: George Melikov <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #5919
Diffstat (limited to 'copy-builtin')
-rwxr-xr-xcopy-builtin7
1 files changed, 5 insertions, 2 deletions
diff --git a/copy-builtin b/copy-builtin
index 716d2022c..d04314bb3 100755
--- a/copy-builtin
+++ b/copy-builtin
@@ -59,8 +59,11 @@ EOF
{
cat <<-"EOF"
- ZFS_MODULE_CFLAGS = -I$(srctree)/include/zfs -I$(srctree)/include/spl
- ZFS_MODULE_CFLAGS += -include $(srctree)/spl_config.h -include $(srctree)/zfs_config.h
+ ZFS_MODULE_CFLAGS = -I$(srctree)/include/zfs
+ 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
obj-$(CONFIG_ZFS) :=