Unverified Commit 791c147c authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #262838 from amjoseph-nixpkgs/pr/lib/systems/abi-suffix

lib/systems/parse.nix: add removeAbiSuffix, use it
parents 2bb79db3 20b62456
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -29,6 +29,15 @@ let
      assert type.check value;
      setType type.name ({ inherit name; } // value));

  # gnu-config will ignore the portion of a triple matching the
  # regex `e?abi.*$` when determining the validity of a triple.  In
  # other words, `i386-linuxabichickenlips` is a valid triple.
  removeAbiSuffix = x:
    let match = builtins.match "(.*)e?abi.*" x;
    in if match==null
       then x
       else lib.elemAt match 0;

in

rec {
@@ -466,7 +475,7 @@ rec {
        else                     vendors.unknown;
      kernel = if hasPrefix "darwin" args.kernel      then getKernel "darwin"
               else if hasPrefix "netbsd" args.kernel then getKernel "netbsd"
               else                                   getKernel args.kernel;
               else                                   getKernel (removeAbiSuffix args.kernel);
      abi =
        /**/ if args ? abi       then getAbi args.abi
        else if isLinux parsed || isWindows parsed then