diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/13/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/13/default.nix | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index c811b24c48ef..cd96231e62c3 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -137,7 +137,6 @@ in let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -203,7 +202,6 @@ in let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -297,28 +295,8 @@ in let libcxx = callPackage ./libcxx { inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else ( - # libcxx >= 13 does not build on gcc9 - if stdenv.cc.isGNU && lib.versionOlder stdenv.cc.version "10" - then pkgs.gcc10Stdenv - else stdenv - ); - }; - - libcxxabi = let - stdenv_ = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; - cxx-headers = callPackage ./libcxx { - inherit llvm_meta; - stdenv = stdenv_; - headersOnly = true; - }; - in callPackage ./libcxxabi { - stdenv = stdenv_; - inherit llvm_meta cxx-headers; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + monorepoSrc = src; }; libunwind = callPackage ./libunwind { |