Unverified Commit e83f597b authored by Alyssa Ross's avatar Alyssa Ross Committed by GitHub
Browse files

linux: fix include path when build with ccache warpped clang (#440872)

parents ec5e74a2 b4f0bcff

pkgs/os-specific/linux/kernel/common-flags.nix

+10 −4
Original line number Diff line number Diff line
@@ -26,9 +26,15 @@ 
  "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

]

# Add the built in headers the kernel needs

++ lib.optionals (stdenv.cc.isClang) [

  "CFLAGS_MODULE=-I${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"

  "CFLAGS_KERNEL=-I${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"

++ lib.optionals (stdenv.cc.isClang) (

  let

    clangLib = lib.getLib stdenv.cc.cc;

    majorVer = lib.versions.major clangLib.version;

  in

  [

    "CFLAGS_MODULE=-I${clangLib}/lib/clang/${majorVer}/include"

    "CFLAGS_KERNEL=-I${clangLib}/lib/clang/${majorVer}/include"

  ]

)

++ (stdenv.hostPlatform.linux-kernel.makeFlags or [ ])

++ extraMakeFlags