From 7eb779860dafba203b048a56c0ee29ed5fb4303b Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 4 Nov 2024 10:13:20 -0800 Subject: [PATCH 1/3] llvmPackages_19.libclc: use unwrapped clang only The build requires an unwrapped clang due to passing in --arch flags. However, for c++ it doesn't pass in --arch and requires standard headers so which requires the wrapped compiler. --- pkgs/development/compilers/llvm/common/libclc.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index c24fc6e3b4c0..d20e6877019b 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -17,6 +17,14 @@ let spirv-llvm-translator = buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }; + + # The build requires an unwrapped clang but wrapped clang++ thus we need to + # split the unwrapped clang out to prevent the build from finding the + # unwrapped clang++ + clang-only = runCommand "clang-only" { } '' + mkdir -p "$out"/bin + ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin + ''; in stdenv.mkDerivation rec { pname = "libclc"; @@ -78,7 +86,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optional (lib.versionAtLeast release_version "19") [ - buildLlvmTools.clang.cc + clang-only buildLlvmTools.llvm spirv-llvm-translator ]; From 1ab5205fbbfa29497a53b71f2fdf8ba12e0fe641 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 5 Nov 2024 22:49:32 -0800 Subject: [PATCH 2/3] llvmPackages_19.bolt: upstream patch to fix darwin build https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e --- pkgs/development/compilers/llvm/common/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index eaba6f45edfe..fd818bb49a74 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -947,6 +947,10 @@ let url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; }) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; + hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; + }) ]; }; } From 3cd45d08ee502f9de7391f59d60fa13c106c5838 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Fri, 1 Nov 2024 03:42:29 +0000 Subject: [PATCH 3/3] llvmPackages_19: 19.1.1 -> 19.1.3 https://github.com/llvm/llvm-project/releases/tag/llvmorg-19.1.3 --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 4d52e48d8775..24a028e77974 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,7 +28,7 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.1".officialRelease.sha256 = "sha256-xTo44+vH1Bz49fEl4bIpU3eIgQtFuBTGbgU7mzeY33s="; + "19.1.3".officialRelease.sha256 = "sha256-NUx01eJNsYMlk+8mtlf10isIqhK8zBmqaOTjuFqMNRQ="; "20.0.0-git".gitRelease = { rev = "0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645"; rev-version = "20.0.0-unstable-2024-10-07";