Browse Source

固定工具链为2023-08-15(rust-1.73) (#22)

固定工具链为2023-08-15(rust-1.73)
LoGin 1 year ago
parent
commit
72331e9d36
4 changed files with 11 additions and 5 deletions
  1. 1 1
      .github/workflows/cache-toolchain.yml
  2. 4 4
      Cargo.toml
  3. 3 0
      Makefile
  4. 3 0
      rust-toolchain.toml

+ 1 - 1
.github/workflows/cache-toolchain.yml

@@ -35,6 +35,6 @@ jobs:
             rustup component add rust-src
             rustup component add llvm-tools-preview
             rustup target add x86_64-unknown-none
-            rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
+            rustup component add rust-src --toolchain nightly-2023-08-15-x86_64-unknown-linux-gnu
             rustup component add rustfmt
             cargo install dadk --version 0.1.2

+ 4 - 4
Cargo.toml

@@ -5,11 +5,11 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-#[lib]
-#name = "drstd"
-#crate-type = ["staticlib"]
+[lib]
+name = "drstd"
+crate-type = ["staticlib"]
 
-#[workspace]
+[workspace]
 members = [ "dlibc" ]
 
 [build-dependencies]

+ 3 - 0
Makefile

@@ -1,4 +1,7 @@
 # TARGET?=$(shell rustc -Z unstable-options --print target-spec-json | grep llvm-target | cut -d '"' -f4)
+export RUSTUP_DIST_SERVER=https://mirrors.ustc.edu.cn/rust-static
+export RUSTUP_UPDATE_ROOT=https://mirrors.ustc.edu.cn/rust-static/rustup
+
 TARGET=x86_64-unknown-dragonos
 
 CARGO?=cargo

+ 3 - 0
rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2023-08-15"
+components = ["rust-src"]