Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 58fbebc4ea55
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 884b0a4417e9
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 2, 2019

  1. androidndk-pkgs: Fix cc-wrapper flags

    @kmicklas
    kmicklas committed Apr 2, 2019
    Copy the full SHA
    5f4bf24 View commit details

  2. Remove unrecognized "float" settings for Android aarch32 systems

    @kmicklas
    kmicklas committed Apr 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    delroth Pierre Bourdon
    GPG key ID: 6FB80DCD84DA0F1C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7afd5e3 View commit details

  3. Merge pull request #58828 from obsidiansystems/km-fix-androidndk-cc-w… 

    …rapper-flags

 androidndk-pkgs: Fix cc-wrapper flags
    @Ericson2314
    Ericson2314 authored Apr 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    884b0a4 View commit details
Showing with 1 addition and 4 deletions.
  1. +0 −2 lib/systems/platforms.nix
  2. +1 −2 pkgs/development/mobile/androidenv/androidndk-pkgs.nix
2 changes: 0 additions & 2 deletions lib/systems/platforms.nix
View file
Original file line number Diff line number Diff line change
@@ -258,7 +258,6 @@ rec {
name = "armeabi";
gcc = {
arch = "armv5te";
float = "soft";
float-abi = "soft";
};
};
@@ -268,7 +267,6 @@ rec {
name = "armeabi-v7a";
gcc = {
arch = "armv7-a";
float = "hard";
float-abi = "softfp";
fpu = "vfpv3-d16";
};
3 changes: 1 addition & 2 deletions pkgs/development/mobile/androidenv/androidndk-pkgs.nix
View file
Original file line number Diff line number Diff line change
@@ -91,8 +91,7 @@ rec {
$out/bin/${stdenv.targetPlatform.config}-c++ \
$out/bin/${stdenv.targetPlatform.config}-gcc \
$out/bin/${stdenv.targetPlatform.config}-g++ \
-e '130i extraBefore+=(-Wl,--fix-cortex-a8)' \
-e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
-e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|'
'')
# GCC 4.9 is the first relase with "-fstack-protector"
+ lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''