Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cc083fa9070c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5789cf479146
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 10, 2018

  1. lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM 

    It is ambiguous, and therefore banned within GCC.
    @Ericson2314
    Ericson2314 committed May 10, 2018
    11
    Copy the full SHA
    58b2e87 View commit details

  2. Merge pull request #40297 from obsidiansystems/arm-abi-disambig 

    lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM
    @Ericson2314
    Ericson2314 authored May 10, 2018

    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
    5789cf4 View commit details
Showing with 17 additions and 2 deletions.
  1. +7 −0 lib/systems/default.nix
  2. +10 −2 lib/systems/parse.nix
7 changes: 7 additions & 0 deletions lib/systems/default.nix
View file
Original file line number Diff line number Diff line change
@@ -50,5 +50,12 @@ rec {
} // mapAttrs (n: v: v final.parsed) inspect.predicates
// args;
in assert final.useAndroidPrebuilt -> final.isAndroid;
assert lib.foldl
(pass: { assertion, message }:
if assertion final
then pass
else throw message)
true
(final.parsed.abi.assertions or []);
final;
}
12 changes: 10 additions & 2 deletions lib/systems/parse.nix
View file
Original file line number Diff line number Diff line change
@@ -192,7 +192,15 @@ rec {
abis = setTypes types.openAbi {
android = {};
cygnus = {};
gnu = {};
gnu = {
assertions = [
{ assertion = platform: !platform.isAarch32;
message = ''
The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead.
'';
}
];
};
msvc = {};
eabi = {};
androideabi = {};
@@ -270,7 +278,7 @@ rec {
kernel = getKernel args.kernel;
abi =
/**/ if args ? abi then getAbi args.abi
else if isLinux parsed then abis.gnu
else if isLinux parsed then (if isAarch32 parsed then abis.gnueabi else abis.gnu)
else if isWindows parsed then abis.gnu
else abis.unknown;
};