From 5d23e617ec5a66681809755f99cbcfa603684f62 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 23 Nov 2021 20:17:53 +0100 Subject: stdenv: Pass standalone argument for libcxxabi --- pkgs/stdenv/darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/stdenv') diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 7578a274cb82..24ad0cb6959f 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). -- cgit 1.4.1