Merge pull request #233408 from emilytrau/remove-lnboot

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

Changed files
+2 -4
pkgs
os-specific
linux
minimal-bootstrap
ln-boot
tinycc
+1 -1
pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix
···
}:
let
pname = "ln-boot";
-
version = "unstable-2023-05-01";
src = ./ln.c;
in
···
}:
let
pname = "ln-boot";
+
version = "unstable-2023-05-22";
src = ./ln.c;
in
+1 -1
pkgs/os-specific/linux/minimal-bootstrap/ln-boot/ln.c
···
if (argc != 4 || strcmp(argv[1], "-s")) {
fputs("Usage: ", stdout);
fputs(argv[0], stdout);
-
fputs("ln -s TARGET LINK_NAME\n", stdout);
exit(EXIT_FAILURE);
}
···
if (argc != 4 || strcmp(argv[1], "-s")) {
fputs("Usage: ", stdout);
fputs(argv[0], stdout);
+
fputs(" -s TARGET LINK_NAME\n", stdout);
exit(EXIT_FAILURE);
}
-2
pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix
···
{ lib
, kaem
, mes-libc
-
, ln-boot
}:
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
···
{ lib
, kaem
, mes-libc
}:
rec {
···
(["-c" "-D" "TCC_TARGET_I386=1" ] ++ libtccBuildOptions);
compiler = kaem.runCommand "${pname}-${version}" {
inherit pname version meta;
passthru.tests = rec {
get-version = result: kaem.runCommand "${pname}-get-version-${version}" {} ''
${result}/bin/tcc -version