diff options
| author | Stéphan Kochen <git@stephank.nl> | 2023-04-22 12:10:13 +0200 |
|---|---|---|
| committer | Stéphan Kochen <git@stephank.nl> | 2023-04-30 15:03:19 +0200 |
| commit | c96a05a29339df5230385f0cfb9ee0c9a4a29017 (patch) | |
| tree | e806b17b667011e597cc8234cebc15f014e4c6c3 | |
| parent | 34966783042097b037f57c911290d6729fa75d0c (diff) | |
llvmPackages_15.compiler-rt: fix missing builtins
Darwin-specific builtins were present on x86-64-darwin, but not on aarch64-darwin. This is the same issue as #186575, but while the fixes were correctly applied to LLVM 15, we were still disabling the build of builtins on aarch64-darwin. Likely just a confusion.
| -rw-r--r-- | pkgs/development/compilers/llvm/15/compiler-rt/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index a3f2355c6a0b8..fe50b091c7657 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/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) '' |