summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2021-11-26 22:12:42 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-12-03 16:10:57 +0000
commit7f09672a202975bcfce323fe1d0af4e745d370a1 (patch)
tree9467e3288f0c623f2f57f90d0535050074640c27
parentcoqPackages.equations: 1.2.4 → 1.3 (for Coq 8.13) (diff)
downloadnixpkgs-7f09672a202975bcfce323fe1d0af4e745d370a1.tar.gz
llvmPackages_13.libcxx: require gcc >=10 on gcc platforms
specifically aarch64. as of version 13 libcxx does not build on gcc9. (cherry picked from commit 54a487505a9c14fa4271ac6858a2af8c23eecbd0)
-rw-r--r--pkgs/development/compilers/llvm/13/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix
index 13be73967143..6c87366ea315 100644
--- a/pkgs/development/compilers/llvm/13/default.nix
+++ b/pkgs/development/compilers/llvm/13/default.nix
@@ -244,7 +244,12 @@ let
inherit llvm_meta;
stdenv = if stdenv.hostPlatform.useLLVM or false
then overrideCC stdenv buildLlvmTools.clangNoLibcxx
- else stdenv;
+ else (
+ # libcxx >= 13 does not build on gcc9
+ if stdenv.cc.isGNU && lib.versionOlder stdenv.cc.version "10"
+ then pkgs.gcc10Stdenv
+ else stdenv
+ );
};
libcxxabi = callPackage ./libcxxabi {