mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-03 02:57:30 +03:00
Merge pull request #147543 from risicle/ris-libcxx-13-aarch64
llvmPackages_13.libcxx: require gcc >=10 on gcc platforms
This commit is contained in:
commit
50474e1857
@ -244,7 +244,12 @@ let
|
|||||||
inherit llvm_meta;
|
inherit llvm_meta;
|
||||||
stdenv = if stdenv.hostPlatform.useLLVM or false
|
stdenv = if stdenv.hostPlatform.useLLVM or false
|
||||||
then overrideCC stdenv buildLlvmTools.clangNoLibcxx
|
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 {
|
libcxxabi = callPackage ./libcxxabi {
|
||||||
|
Loading…
Reference in New Issue
Block a user