From 856eb81d1f9d60c82567f3ed73f3bd637b28e6b8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 25 Nov 2023 15:27:18 -0500 Subject: llvmPackages_{7,8,9}.{llvm-polly,libllvm-polly}: fix build with clang 16 Same fix as https://github.com/NixOS/nixpkgs/pull/265967. --- pkgs/development/compilers/llvm/7/llvm/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/8/llvm/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/9/llvm/default.nix | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) (limited to 'pkgs/development/compilers') 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 \ -- cgit 1.4.1 From cc2d0f04db141124215b199b67b0f6008a64d86f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 25 Nov 2023 16:30:06 -0500 Subject: llvmPackages_6.lldb: fix build on x86_64-darwin --- pkgs/development/compilers/llvm/6/lldb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/llvm/6/lldb/default.nix b/pkgs/development/compilers/llvm/6/lldb/default.nix index e64584edf29d..c8d3c4c1a771 100644 --- a/pkgs/development/compilers/llvm/6/lldb/default.nix +++ b/pkgs/development/compilers/llvm/6/lldb/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.DebugSymbols darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; -- cgit 1.4.1