From 9faa070404d743c3d2ab61f2bc2a5555b053c2cf Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Sun, 16 Apr 2023 21:59:07 +0200 Subject: [PATCH] mrustc-bootstrap: Document workarounds --- pkgs/development/compilers/mrustc/bootstrap.nix | 2 +- .../compilers/mrustc/patches/0001-dont-download-rustc.patch | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index 95c4ec04037..a8bf26bacdf 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { makeFlags = [ # Use shared mrustc/minicargo/llvm instead of rebuilding them "MRUSTC=${mrustc}/bin/mrustc" - #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: uncomment this so minicargo doesn't get rebuilt + #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" ]; diff --git a/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch b/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch index 6fa2bca1ab4..7b92958af49 100644 --- a/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch +++ b/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch @@ -1,3 +1,6 @@ +The $(RUSTC_SRC_DL) file already exists, but for some reason Make wants to rebuild +this target when it has $(RUSTC_SRC_TARBALL) as a dependency. + --- a/minicargo.mk 2023-04-06 08:26:18.408817572 +0200 +++ b/minicargo.mk 2023-04-06 08:27:11.553536996 +0200 @@ -176,7 +176,7 @@