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

Merge pull request #233408 from emilytrau/remove-lnboot 

minimal-bootstrap.tinycc-mes: remove unused ln-boot dependency
parents f3ff5509 d402a52e

pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
}:

let

  pname = "ln-boot";

  version = "unstable-2023-05-01";

  version = "unstable-2023-05-22";



  src = ./ln.c;

in

pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ int main(int argc, char** argv) 
  if (argc != 4 || strcmp(argv[1], "-s")) {

    fputs("Usage: ", stdout);

    fputs(argv[0], stdout);

    fputs("ln -s TARGET LINK_NAME\n", stdout);

    fputs(" -s TARGET LINK_NAME\n", stdout);

    exit(EXIT_FAILURE);

  }

pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix

+0 −2
Original line number Diff line number Diff line 
{ lib

, kaem

, mes-libc

, ln-boot

}:



rec {
@@ -57,7 +56,6 @@ rec { 
        (["-c" "-D" "TCC_TARGET_I386=1" ] ++ libtccBuildOptions);

      compiler =  kaem.runCommand "${pname}-${version}" {

        inherit pname version meta;

        nativeBuildInputs = [ ln-boot ];

        passthru.tests = rec {

          get-version = result: kaem.runCommand "${pname}-get-version-${version}" {} ''

            ${result}/bin/tcc -version