androidndkPkgs: expose libc in cc.lib (#87737)

Fixes cross compiling gdb that uses targetPackages.stdenv.cc.cc.lib.
2020-05-16 09:22:24 +00:00
parent df70dcb6fb
commit d028c74c3c
1 changed files with 4 additions and 1 deletions
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -82,7 +82,10 @@ rec {
  };

  clang = wrapCCWith {
-    cc = binaries;
+    cc = binaries // {
+      # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib)
+      lib = targetAndroidndkPkgs.libraries;
+    };
    bintools = binutils;
    libc = targetAndroidndkPkgs.libraries;
    extraBuildCommands = ''