Skip to content

Commit

Permalink
Fix --enable-linux-builtin
Browse files Browse the repository at this point in the history
Adding VPATH support, commit 47a4a6f, required that a `src`
and `obj` line be added to the top of the Makefiles.  They
must be removed from the Makefiles when builtin.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue openzfs/spl#481
Issue openzfs/spl#498
  • Loading branch information
behlendorf authored and nedbass committed Dec 24, 2015
1 parent 13a9527 commit d8ac2b3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions copy-builtin
Expand Up @@ -55,6 +55,8 @@ adjust_obj_paths()
for MODULE in "${MODULES[@]}"
do
adjust_obj_paths "$KERNEL_DIR/fs/zfs/$MODULE/Makefile"
sed -i.bak '/obj =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile"
sed -i.bak '/src =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile"
done

cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF"
Expand Down

0 comments on commit d8ac2b3

Please sign in to comment.