diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-05-16 09:22:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 09:22:24 +0000 |
| commit | d028c74c3c07a9108379d123644b6b8ef5847075 (patch) | |
| tree | e20b43fac5d989998c2763a8691e6cf402f02779 | |
| parent | df70dcb6fb506bfca51f509700b2e7378f8eadcb (diff) | |
| download | nixpkgs-d028c74c3c07a9108379d123644b6b8ef5847075.tar nixpkgs-d028c74c3c07a9108379d123644b6b8ef5847075.tar.gz nixpkgs-d028c74c3c07a9108379d123644b6b8ef5847075.tar.bz2 nixpkgs-d028c74c3c07a9108379d123644b6b8ef5847075.tar.lz nixpkgs-d028c74c3c07a9108379d123644b6b8ef5847075.tar.xz nixpkgs-d028c74c3c07a9108379d123644b6b8ef5847075.tar.zst nixpkgs-d028c74c3c07a9108379d123644b6b8ef5847075.zip | |
androidndkPkgs: expose libc in cc.lib (#87737)
Fixes cross compiling gdb that uses targetPackages.stdenv.cc.cc.lib.
| -rw-r--r-- | pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index f8be40eecab..04420370ff1 100644 --- 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 = '' |