Unverified Commit b0a12b84 authored by Emily's avatar Emily Committed by GitHub
Browse files

Revert "pkgs/top-level/stage.nix: add pkgsLLVMLibc" (#401317)

parents 52de3715 0931f4e8

lib/systems/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ let 
              "uclibc"

            else if final.isAndroid then

              "bionic"

            else if final.isLLVMLibc then

              "llvm"

            else if

              final.isLinux # default

            then
@@ -248,7 +246,7 @@ let 
          # don't support dynamic linking, but don't get the `staticMarker`.

          # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always

          # has the `staticMarker`.

          isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;

          isStatic = final.isWasi || final.isRedox;



          # Just a guess, based on `system`

          inherit

lib/systems/inspect.nix

+0 −1
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ rec { 
        uclibceabi

        uclibceabihf

      ];

    isLLVMLibc = [ { abi = abis.llvm; } ];



    isEfi = [

      {

lib/systems/parse.nix

+0 −3
Original line number Diff line number Diff line
@@ -740,9 +740,6 @@ rec { 
    };

    uclibc = { };



    # LLVM libc

    llvm = { };



    unknown = { };

  };

pkgs/top-level/release-attrpaths-superset.nix

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ let 


    # cross packagesets

    pkgsLLVM = true;

    pkgsLLVMLibc = true;

    pkgsMusl = true;

    pkgsStatic = true;

    pkgsCross = true;

pkgs/top-level/release.nix

+0 −4
Original line number Diff line number Diff line
@@ -382,10 +382,6 @@ let 
          "x86_64-linux"

          "aarch64-linux"

        ];

        pkgsLLVMLibc.stdenv = [

          "x86_64-linux"

          "aarch64-linux"

        ];

        pkgsArocc.stdenv = [

          "x86_64-linux"

          "aarch64-linux"