about summary refs log tree commit diff
path: root/pkgs/stdenv/darwin/make-bootstrap-tools.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/stdenv/darwin/make-bootstrap-tools.nix')
-rw-r--r--pkgs/stdenv/darwin/make-bootstrap-tools.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 384567739d0e8..be891aecd2f6f 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -116,7 +116,11 @@ rec {
       cp -rd ${lib.getLib llvmPackages.clang-unwrapped}/lib/* $out/lib
 
       cp -d ${lib.getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib
+    ''
+    # libc++abi is contained in libcxx for LLVM12+. Remove once unpinned from LLVM11
+    + lib.optionalString (llvmPackages ? libcxxabi) ''
       cp -d ${lib.getLib llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib
+    '' + ''
       cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin
       cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib
       cp -d ${lib.getLib llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib