cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mrustc-bootstrap: Recompile minicargo

Browse source
This commit is contained in:
Val Lorentz 2023-04-08 10:56:35 +02:00
parent 3c00d2ee2b
commit 70455de76d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/compilers/mrustc/bootstrap.nix
View file

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
# Use shared mrustc/minicargo/llvm instead of rebuilding them # Use shared mrustc/minicargo/llvm instead of rebuilding them
"MRUSTC=${mrustc}/bin/mrustc" "MRUSTC=${mrustc}/bin/mrustc"
"MINICARGO=${mrustc-minicargo}/bin/minicargo" #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: uncomment this so minicargo doesn't get rebuilt
"LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config"
"RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}"
]; ];
@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
export OUTDIR_SUF=-${rustcVersion} export OUTDIR_SUF=-${rustcVersion}
export RUSTC_VERSION=${rustcVersion} export RUSTC_VERSION=${rustcVersion}
export MRUSTC_TARGET_VER=${mrustcTargetVersion} export MRUSTC_TARGET_VER=${mrustcTargetVersion}
export MRUSTC_PATH=${mrustc}/bin/mrustc
echo minicargo.mk: libs echo minicargo.mk: libs
make -f minicargo.mk "''${flagsArray[@]}" LIBS make -f minicargo.mk "''${flagsArray[@]}" LIBS