summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authortoonn <toonn@toonn.io>2021-11-23 20:17:53 +0100
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-11-24 15:17:13 -0800
commit5d23e617ec5a66681809755f99cbcfa603684f62 (patch)
treecc861808717fc997d0520cc786591e1b90f5b377 /pkgs/stdenv
parent21df776a314b955d480bcd83dfbe0932f4aecf63 (diff)
downloadnixpkgs-5d23e617ec5a66681809755f99cbcfa603684f62.tar
nixpkgs-5d23e617ec5a66681809755f99cbcfa603684f62.tar.gz
nixpkgs-5d23e617ec5a66681809755f99cbcfa603684f62.tar.bz2
nixpkgs-5d23e617ec5a66681809755f99cbcfa603684f62.tar.lz
nixpkgs-5d23e617ec5a66681809755f99cbcfa603684f62.tar.xz
nixpkgs-5d23e617ec5a66681809755f99cbcfa603684f62.tar.zst
nixpkgs-5d23e617ec5a66681809755f99cbcfa603684f62.zip
stdenv: Pass standalone argument for libcxxabi
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/darwin/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 7578a274cb8..24ad0cb6959 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -469,7 +469,7 @@ rec {
               };
               libcxxabi = libSuper.libcxxabi.override ({
                 stdenv = overrideCC self.stdenv self.ccNoLibcxx;
-              } // lib.optionalAttrs (finalLlvmVersion == "7") {
+              } // lib.optionalAttrs (builtins.any (v: finalLlvmVersion == v) [ 7 11 12 13 ]) {
                 # TODO: the bootstrapping of llvm packages isn't consistent.
                 # `standalone` may be redundant if darwin behaves like useLLVM (or
                 # has useLLVM = true).