From 85492cd5fd4c7cd8975c4f256113e3c101abd261 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sun, 17 Nov 2024 13:38:00 -0800 Subject: [PATCH] llvmPackages_12.compiler-rt: fix build race aarch64-darwin https://github.com/llvm/llvm-project/commit/b31080c596246bc26d2493cfd5e07f053cf9541c (cherry picked from commit 47a4caf4839500e93fed4ada995ee40586038e9e) (cherry picked from commit c5d97e05777a018712e2388ce736be80eb20b24a) --- pkgs/development/compilers/llvm/common/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index fa1f61bfd5d1..b53f76e96c11 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -1006,6 +1006,13 @@ let ++ [ (metadata.getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config ] + ++ lib.optional (lib.versions.major metadata.release_version == "12") (fetchpatch { + # fixes the parallel build on aarch64 darwin + name = "fix-symlink-race-aarch64-darwin.patch"; + url = "https://github.com/llvm/llvm-project/commit/b31080c596246bc26d2493cfd5e07f053cf9541c.patch"; + relative = "compiler-rt"; + hash = "sha256-Cv2NC8402yU7QaTR6TzdH+qyWRy+tTote7KKWtKRWFQ="; + }) ++ lib.optional ( lib.versions.major metadata.release_version == "12" || (