android cross: Support 32-bit too #40387

Ericson2314 · 2018-05-11T23:11:13Z

I didn't do this initially because there were a few things I wanted to research/clean. That is all done now.

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
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 nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

Function are never equal in Nix, so we need to filter out this attribute in ABIs.

This is analogous to the GNU assertion.

Ericson2314 added 2 commits May 11, 2018 19:02

lib/systems/inspect: Fix after assertions

f4de669

Function are never equal in Nix, so we need to filter out this attribute in ABIs.

lib/systems: Add assertion to "android" ABI

28bacc2

This is analogous to the GNU assertion.

Ericson2314 requested a review from nbp as a code owner May 11, 2018 23:11

prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a

827ef09

Ericson2314 force-pushed the android-32 branch from 8270835 to 827ef09 Compare May 11, 2018 23:17

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels May 11, 2018

Ericson2314 merged commit 3fb09ac into NixOS:master May 11, 2018

Ericson2314 deleted the android-32 branch May 11, 2018 23:35

Provide feedback