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

Jump to bottom

Fix Android NDK for 19.03 #60645

Merged
merged 6 commits into from May 1, 2019
Merged

Fix Android NDK for 19.03 #60645

merged 6 commits into from May 1, 2019

Conversation

kmicklas
Copy link
Contributor

@kmicklas kmicklas commented May 1, 2019

This backports #59253 and #59743, along with ead13a3 which is necessary for LLVM.

Motivation for this change

This works on 18.09 and master but not 19.03.

Things done
nix-build -A hello --arg crossSystem '(import ./lib).systems.examples.armv7a-android-prebuilt'
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

kmicklas and others added 6 commits April 30, 2019 16:51
@kmicklas
androidndk-pkgs: Fix cc-wrapper flags
7fdf74b 
(cherry picked from commit 5f4bf24)
@matthewbauer
androidndk: fixup mess
fcbe865 
New android ndk (18) now uses clang. We were going through the wrapper
that are provided. This lead to surprising errors when building.
Ideally we could use the llvm linker as well, but this leads to errors
as many packages don’t support the llvm linker.
@matthewbauer
readline: add android patch
54b18ff
@matthewbauer
systems: remove android armv5te platform
9e1dd3b 
this isn’t useful any more because the ndk we use no longer supports it.
androidndk-pkgs: Remove -mfloat flag
f07df17
@matthewbauer
llvm: don’t use targetPlatform
2529c0c 
LLVM should be target independent because it will work with all
machine types. This is different from GCC where it needs to know what
target to build ahead of time.
@matthewbauer matthewbauer merged commit f87a18b into NixOS:release-19.03 May 1, 2019
@kmicklas kmicklas deleted the km-androidndk-fixes-backport-19.03 branch May 1, 2019 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@matthewbauer matthewbauer Awaiting requested review from matthewbauer matthewbauer is a code owner

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@kmicklas @matthewbauer