Skip to content

Commit

Permalink
Use cargo build instead of cargo xbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
simnalamburt committed Jul 27, 2020
1 parent 1a19037 commit 4343851
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ clean:
#
$(src)/rust/target/x86_64-linux-kernel/release/libflashbench.a: $(src)/rust/Cargo.toml $(wildcard $(src)/rust/src/*.rs)
cd $(src)/rust &&\
env -u MAKE -u MAKEFLAGS cargo +nightly xbuild --release
env -u MAKE -u MAKEFLAGS cargo +nightly build --release

%.rust.o: rust/target/x86_64-linux-kernel/release/lib%.a
$(LD) -r -o $@ --whole-archive $<
6 changes: 3 additions & 3 deletions rust/.cargo/config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[alias]
xbuild = "build -Z build-std=core"

[build]
target = "x86_64-linux-kernel"

[unstable]
build-std = ["core"]
8 changes: 4 additions & 4 deletions rust/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Rust part of flashbench
========

```bash
# Use nightly as default toolchain in this directory
rustup override set nightly
cargo +nightly build

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

### TODOs
Expand Down

0 comments on commit 4343851

Please sign in to comment.