diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-11-25 15:27:18 -0500 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-11-25 16:31:12 -0500 |
| commit | 856eb81d1f9d60c82567f3ed73f3bd637b28e6b8 (patch) | |
| tree | 1e264cefae1c3f2cb62a54b07955096326d3f59c /pkgs/development/compilers/llvm | |
| parent | effbeb808ba113bb9eb899eed38baec8ad2f32ad (diff) | |
| download | nixlib-856eb81d1f9d60c82567f3ed73f3bd637b28e6b8.tar nixlib-856eb81d1f9d60c82567f3ed73f3bd637b28e6b8.tar.gz nixlib-856eb81d1f9d60c82567f3ed73f3bd637b28e6b8.tar.bz2 nixlib-856eb81d1f9d60c82567f3ed73f3bd637b28e6b8.tar.lz nixlib-856eb81d1f9d60c82567f3ed73f3bd637b28e6b8.tar.xz nixlib-856eb81d1f9d60c82567f3ed73f3bd637b28e6b8.tar.zst nixlib-856eb81d1f9d60c82567f3ed73f3bd637b28e6b8.zip | |
llvmPackages_{7,8,9}.{llvm-polly,libllvm-polly}: fix build with clang 16
Same fix as https://github.com/NixOS/nixpkgs/pull/265967.
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/7/llvm/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/8/llvm/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/9/llvm/default.nix | 12 |
3 files changed, 33 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index 97ac428a7f55..71beb79a1cda 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -110,7 +110,17 @@ in stdenv.mkDerivation (rec { }) ../../llvm-7-musl.patch - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 7 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 8a0fea85e260..7cef04347429 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -117,7 +117,17 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 8 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 526030d6b34d..75c786855973 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -115,7 +115,17 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 9 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ |