From 85a7771af6ddc31e7cb1982f1e553cd008f673c2 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 1 Jun 2023 20:40:51 -0400 Subject: [PATCH] llvmPackages_16.compiler-rt: fix missing builtins Based on c96a05a29339df5230385f0cfb9ee0c9a4a29017 but for LLVM 16. --- pkgs/development/compilers/llvm/16/compiler-rt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index 3666f291c321c..e2b8d470f8909 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -97,8 +97,6 @@ stdenv.mkDerivation { substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/builtin-config-ix.cmake \ - --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + lib.optionalString (useLLVM) ''