From 52dbb6275fd023ab91670c9d3938f074bc7eeb1b Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 6 Apr 2019 20:06:09 +0800
Subject: [PATCH] rust: fix riscv target name

---
 compilers/rust/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compilers/rust/default.nix b/compilers/rust/default.nix
index aa295ca..db591af 100644
--- a/compilers/rust/default.nix
+++ b/compilers/rust/default.nix
@@ -18,7 +18,7 @@ let
     phases = [ "unpackPhase" "buildPhase" ];
     buildPhase = ''
       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}
       ''${rustc} --crate-name core src/libcore/lib.rs
@@ -58,8 +58,8 @@ in
     src = ./.;
     installPhase = ''
       mkdir $out
-      mkdir -p $out/lib/rustlib/riscv32imac-unknown-none/lib/
-      cp -r ${riscv32imac-crates}/* $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-elf/lib/
       cp -r ${rustc_internal}/* $out
     '';
     meta = with stdenv.lib; {