Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

androidndkPkgs: expose libc in cc.lib #87737

Merged
merged 1 commit into from May 16, 2020
Merged

Conversation

@orivej
Copy link
Contributor

orivej commented May 13, 2020

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

/cc @Ericson2314

@Ericson2314
Copy link
Member

Ericson2314 commented May 13, 2020

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 orivej force-pushed the orivej:android-cross branch from cbd76c3 to 5d7577e May 15, 2020
@orivej orivej changed the title gdb: fix cross compiling for android android-cross androidndkPkgs: expose libc in cc.lib May 15, 2020
@orivej orivej changed the title android-cross androidndkPkgs: expose libc in cc.lib androidndkPkgs: expose libc in cc.lib May 15, 2020
@orivej
Copy link
Contributor Author

orivej commented May 15, 2020

Thank you!

@orivej-nixos orivej-nixos merged commit d028c74 into NixOS:master May 16, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d7577e"; rev="5d7577e1deb58e16cb2e662d6d9e9e36d2bab332"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d7577e"; rev="5d7577e1deb58e16cb2e662d6d9e9e36d2bab332"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d7577e"; rev="5d7577e1deb58e16cb2e662d6d9e9e36d2bab332"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d7577e"; rev="5d7577e1deb58e16cb2e662d6d9e9e36d2bab332"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d7577e"; rev="5d7577e1deb58e16cb2e662d6d9e9e36d2bab332"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d7577e"; rev="5d7577e1deb58e16cb2e662d6d9e9e36d2bab332"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d7577e"; rev="5d7577e1deb58e16cb2e662d6d9e9e36d2bab332"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.