Skip to content

Commit

Permalink
Fix icp include directories for in-tree build
Browse files Browse the repository at this point in the history
When zfs is built in-tree using --enable-linux-builtin, the compile
commands are executed from the kernel build directory. If the build
directory is different from the kernel source directory, passing
-Ifs/zfs/icp will not find the headers as they are not present in the
build directory.

Fix this by adding @abs_top_srcdir@ to pull the headers from the zfs
source tree instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10021
  • Loading branch information
nivedita76 authored Feb 20, 2020
1 parent 8136956 commit 65635c3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions module/icp/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ MODULE := icp

obj-$(CONFIG_ZFS) := $(MODULE).o

asflags-y := -I$(src)/include
asflags-y := -I@abs_top_srcdir@/module/icp/include
asflags-y += $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
ccflags-y := -I$(src)/include
ccflags-y := -I@abs_top_srcdir@/module/icp/include
ccflags-y += $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)

$(MODULE)-objs += illumos-crypto.o
Expand Down

0 comments on commit 65635c3

Please sign in to comment.