From 71d262c2e00fa014bca6b3e724aa4b0f7e0ab76a Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 17 Dec 2024 21:08:37 -0800 Subject: [PATCH] llvmPackages_{12-19}.llvm: fix darwin build build breaks after replace -> replace-fail https://github.com/NixOS/nixpkgs/commit/df8af496f7930c4907415052f41a6d2059b43573 pattern fails to match and doesn't seem to have a match in llvm-[12-] https://github.com/llvm/llvm-project/blob/release/12.x/llvm/cmake/modules/AddLLVM.cmake --- pkgs/development/compilers/llvm/common/llvm/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index b29fa87e6072..b17844869086 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -139,8 +139,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace-fail 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace-fail 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + --replace-fail 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" '' + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7