Skip to content

Don't explicitly require compiler-builtins(-mem) #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/msrv_toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
# Oldest nightly that currently works with `cargo xtask build`.
channel = "nightly-2022-04-18"
channel = "nightly-2022-08-08"
components = ["rust-src"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ prerequisites for running the tests.
For instructions on how to create your own UEFI apps, see the [BUILDING.md](BUILDING.md) file.

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

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

Expand Down
6 changes: 2 additions & 4 deletions book/src/tutorial/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ Run this command to build the application:

```sh
cargo build --target x86_64-unknown-uefi \
-Zbuild-std=core,compiler_builtins,alloc \
-Zbuild-std-features=compiler-builtins-mem
-Zbuild-std=core,alloc
```

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

[unstable]
build-std = ["core", "compiler_builtins", "alloc"]
build-std-features = ["compiler-builtins-mem"]
build-std = ["core", "alloc"]
```

Now you can build much more simply:
Expand Down
3 changes: 1 addition & 2 deletions template/.cargo/config
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
[unstable]
build-std = ["core", "compiler_builtins", "alloc"]
build-std-features = ["compiler-builtins-mem"]
build-std = ["core", "alloc"]
7 changes: 1 addition & 6 deletions xtask/src/cargo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,7 @@ impl Cargo {
}

if let Some(target) = self.target {
cmd.args([
"--target",
target.as_triple(),
"-Zbuild-std=core,compiler_builtins,alloc",
"-Zbuild-std-features=compiler-builtins-mem",
]);
cmd.args(["--target", target.as_triple(), "-Zbuild-std=core,alloc"]);
}

if self.packages.is_empty() {
Expand Down