Skip to content

Commit 2c68139

Browse files
YtvwlDnicholasbishop
authored andcommitted
Don't explicitly require compiler-builtins(-mem)
They are implicit on uefi as of rust-lang/compiler-builtins#473. The first nightly version where this is working is 2022-08-08.
1 parent 5f336e1 commit 2c68139

File tree

5 files changed

+6
-14
lines changed

5 files changed

+6
-14
lines changed

.github/workflows/msrv_toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
22
# Oldest nightly that currently works with `cargo xtask build`.
3-
channel = "nightly-2022-04-18"
3+
channel = "nightly-2022-08-08"
44
components = ["rust-src"]

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ prerequisites for running the tests.
104104
For instructions on how to create your own UEFI apps, see the [BUILDING.md](BUILDING.md) file.
105105

106106
The uefi-rs crates currently require some [unstable features].
107-
The nightly MSRV is currently 2022-04-18.
107+
The nightly MSRV is currently 2022-08-08.
108108

109109
[unstable features]: https://github.com/rust-osdev/uefi-rs/issues/452
110110

book/src/tutorial/building.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ Run this command to build the application:
2424

2525
```sh
2626
cargo build --target x86_64-unknown-uefi \
27-
-Zbuild-std=core,compiler_builtins,alloc \
28-
-Zbuild-std-features=compiler-builtins-mem
27+
-Zbuild-std=core,alloc
2928
```
3029

3130
This will produce an x86-64 executable:
@@ -49,8 +48,7 @@ Create `.cargo/config.toml` with these contents:
4948
target = "x86_64-unknown-uefi"
5049

5150
[unstable]
52-
build-std = ["core", "compiler_builtins", "alloc"]
53-
build-std-features = ["compiler-builtins-mem"]
51+
build-std = ["core", "alloc"]
5452
```
5553

5654
Now you can build much more simply:

template/.cargo/config

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
[unstable]
2-
build-std = ["core", "compiler_builtins", "alloc"]
3-
build-std-features = ["compiler-builtins-mem"]
2+
build-std = ["core", "alloc"]

xtask/src/cargo.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,7 @@ impl Cargo {
221221
}
222222

223223
if let Some(target) = self.target {
224-
cmd.args([
225-
"--target",
226-
target.as_triple(),
227-
"-Zbuild-std=core,compiler_builtins,alloc",
228-
"-Zbuild-std-features=compiler-builtins-mem",
229-
]);
224+
cmd.args(["--target", target.as_triple(), "-Zbuild-std=core,alloc"]);
230225
}
231226

232227
if self.packages.is_empty() {

0 commit comments

Comments
 (0)