M-Labs
/
HeavyX
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rust: fix riscv target name

This commit is contained in:
Sebastien Bourdeauducq 2019-04-06 20:06:09 +08:00
parent 96b7248514
commit 52dbb6275f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compilers/rust/default.nix
View File

@ -18,7 +18,7 @@ let
phases = [ "unpackPhase" "buildPhase" ]; phases = [ "unpackPhase" "buildPhase" ];
buildPhase = '' buildPhase = ''
destdir=$out destdir=$out
rustc="${rustc_internal}/bin/rustc --out-dir ''${destdir} -L ''${destdir} --target riscv32imac-unknown-none -g -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s --crate-type rlib" rustc="${rustc_internal}/bin/rustc --out-dir ''${destdir} -L ''${destdir} --target riscv32imac-unknown-none-elf -g -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s --crate-type rlib"
mkdir -p ''${destdir} mkdir -p ''${destdir}
''${rustc} --crate-name core src/libcore/lib.rs ''${rustc} --crate-name core src/libcore/lib.rs
@ -58,8 +58,8 @@ in
src = ./.; src = ./.;
installPhase = '' installPhase = ''
mkdir $out mkdir $out
mkdir -p $out/lib/rustlib/riscv32imac-unknown-none/lib/ mkdir -p $out/lib/rustlib/riscv32imac-unknown-none-elf/lib/
cp -r ${riscv32imac-crates}/* $out/lib/rustlib/riscv32imac-unknown-none/lib/ cp -r ${riscv32imac-crates}/* $out/lib/rustlib/riscv32imac-unknown-none-elf/lib/
cp -r ${rustc_internal}/* $out cp -r ${rustc_internal}/* $out
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {