androidndkPkgs: expose libc in cc.lib #87737
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Sorry I didn't notice the bug earlier. We can actually fix the underlying problem: diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index f8be40eecab..26a6fbd6c63 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -82,7 +82,9 @@ rec {
};
clang = wrapCCWith {
- cc = binaries;
+ cc = binaries // {
+ # for packages expecting libcompiler-rt, etc. to come from here
+ lib = targetAndroidndkPkgs.libraries;
+ };
bintools = binutils;
libc = targetAndroidndkPkgs.libraries;
extraBuildCommands = ''Let's do that instead? |
Fixes cross compiling gdb that uses targetPackages.stdenv.cc.cc.lib.
orivej
changed the title
orivej
changed the title
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This fixes evaluation of packages in pkgsCross.armv7a-android-prebuilt and pkgsCross.aarch64-android-prebuilt — see #74806 (comment) . This allowed me to build pkgsCross.armv7a-android-prebuilt.libffi.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)/cc @Ericson2314