Skip to content

Commit 4343851

Browse files
committed
Use cargo build instead of cargo xbuild
Reference: rust-lang/cargo#8393
1 parent 1a19037 commit 4343851

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ clean:
3333
#
3434
$(src)/rust/target/x86_64-linux-kernel/release/libflashbench.a: $(src)/rust/Cargo.toml $(wildcard $(src)/rust/src/*.rs)
3535
cd $(src)/rust &&\
36-
env -u MAKE -u MAKEFLAGS cargo +nightly xbuild --release
36+
env -u MAKE -u MAKEFLAGS cargo +nightly build --release
3737

3838
%.rust.o: rust/target/x86_64-linux-kernel/release/lib%.a
3939
$(LD) -r -o $@ --whole-archive $<

rust/.cargo/config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[alias]
2-
xbuild = "build -Z build-std=core"
3-
41
[build]
52
target = "x86_64-linux-kernel"
3+
4+
[unstable]
5+
build-std = ["core"]

rust/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Rust part of flashbench
22
========
33

44
```bash
5-
# Use nightly as default toolchain in this directory
6-
rustup override set nightly
5+
cargo +nightly build
76

8-
# xbuild is alias of `build -Z build-std=core`
9-
cargo xbuild
7+
# You can set nightly as default rust toolchain in this project using rustup
8+
rustup override set nightly
9+
cargo build
1010
```
1111

1212
### TODOs

0 commit comments

Comments
 (0)