cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #136251 from lovesegfault/zfs-fix-configure

Browse source 
linuxPackages.zfs: fix m4 script when not using GCC
This commit is contained in:
Bernardo Meurer 2021-09-01 18:15:02 +00:00 committed by GitHub
commit 03f44bd225
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/os-specific/linux/zfs/default.nix
View file

@ -47,6 +47,11 @@ let
postPatch = optionalString buildKernel '' postPatch = optionalString buildKernel ''
patchShebangs scripts patchShebangs scripts
# https://github.com/openzfs/zfs/issues/10107
substituteInPlace ./config/kernel.m4 \
--replace "make modules" "make CC=$CC modules"
# The arrays must remain the same length, so we repeat a flag that is # The arrays must remain the same length, so we repeat a flag that is
# already part of the command and therefore has no effect. # already part of the command and therefore has no effect.
substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \