diff --git a/compilers/rust-riscv32imc-crates.nix b/compilers/rust-riscv32i-crates.nix similarity index 85% rename from compilers/rust-riscv32imc-crates.nix rename to compilers/rust-riscv32i-crates.nix index 55210ba..1bf9a04 100644 --- a/compilers/rust-riscv32imc-crates.nix +++ b/compilers/rust-riscv32i-crates.nix @@ -8,12 +8,12 @@ let }; in stdenv.mkDerivation { - name = "rust-riscv32imc-crates"; + name = "rust-riscv32i-crates"; src = rustc.src; phases = [ "unpackPhase" "buildPhase" ]; buildPhase = '' - destdir=$out/lib/rustlib/riscv32imc-unknown-none-elf/lib/ - rustc="${rustc}/bin/rustc --out-dir ''${destdir} -L ''${destdir} --target riscv32imc-unknown-none-elf -g -C opt-level=s --crate-type rlib" + destdir=$out/lib/rustlib/riscv32i-unknown-none-elf/lib/ + rustc="${rustc}/bin/rustc --out-dir ''${destdir} -L ''${destdir} --target riscv32i-unknown-none-elf -g -C opt-level=s --crate-type rlib" mkdir -p ''${destdir} export RUSTC_BOOTSTRAP=1 diff --git a/default.nix b/default.nix index a9d7872..a4cd20a 100644 --- a/default.nix +++ b/default.nix @@ -20,7 +20,7 @@ rec { gcc-riscv32 = pkgs.callPackage ./compilers/gcc.nix { platform = "riscv32"; platform-binutils = binutils-riscv32; }; binutils-riscv64 = pkgs.callPackage ./compilers/binutils.nix { platform = "riscv64"; }; gcc-riscv64 = pkgs.callPackage ./compilers/gcc.nix { platform = "riscv64"; platform-binutils = binutils-riscv64; }; - rust-riscv32imc-crates = pkgs.callPackage ./compilers/rust-riscv32imc-crates.nix { }; + rust-riscv32i-crates = pkgs.callPackage ./compilers/rust-riscv32i-crates.nix { }; fw-helloworld = pkgs.callPackage ./firmware { inherit rust-riscv32i-crates binutils-riscv32; }; };