Skip to content

Commit a4b25a2

Browse files
xtask: Fully drop support for build-std
This requires an MSRV bump to 2022-11-22. (The build-std targets were actually added in 2022-11-10, but there were some bugs in the dist at that time that cause linker errors on i686.)
1 parent 8900f5e commit a4b25a2

File tree

4 files changed

+4
-24
lines changed

4 files changed

+4
-24
lines changed

.github/workflows/msrv_toolchain.toml

+2-2
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-08-25"
4-
components = ["rust-src"]
3+
channel = "nightly-2022-11-22"
4+
targets = ["aarch64-unknown-uefi", "i686-unknown-uefi", "x86_64-unknown-uefi"]

README.md

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

9696
The uefi-rs crates currently require some [unstable features].
97-
The nightly MSRV is currently 2022-08-25.
97+
The nightly MSRV is currently 2022-11-22.
9898

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

uefi/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ For additional information, refer to the [UEFI specification][spec].
5252
For instructions on how to create your own UEFI apps, see the [tutorial].
5353

5454
The uefi-rs crates currently require some [unstable features].
55-
The nightly MSRV is currently 2022-08-25.
55+
The nightly MSRV is currently 2022-11-22.
5656

5757
[unstable features]: https://github.com/rust-osdev/uefi-rs/issues/452
5858
[tutorial]: https://rust-osdev.github.io/uefi-rs/HEAD/tutorial/introduction.html

xtask/src/cargo.rs

-20
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,6 @@ pub fn fix_nested_cargo_env(cmd: &mut Command) {
204204
cmd.env("PATH", sanitized_path(orig_path));
205205
}
206206

207-
/// Check if the three UEFI targets are installed via rustup (only
208-
/// supported since nightly-2022-11-10).
209-
fn is_target_installed(target: &str) -> Result<bool> {
210-
let output = Command::new("rustup")
211-
.args(["target", "list", "--installed"])
212-
.output()?;
213-
if !output.status.success() {
214-
bail!("failed to get installed targets");
215-
}
216-
let stdout = String::from_utf8(output.stdout)?;
217-
Ok(stdout.lines().any(|x| x == target))
218-
}
219-
220207
#[derive(Debug)]
221208
pub struct Cargo {
222209
pub action: CargoAction,
@@ -282,13 +269,6 @@ impl Cargo {
282269

283270
if let Some(target) = self.target {
284271
cmd.args(["--target", target.as_triple()]);
285-
286-
// If the target is not installed, use build-std. Keep this
287-
// around until our minimum-supported nightly version is at
288-
// least 2022-11-10.
289-
if !is_target_installed(target.as_triple())? {
290-
cmd.args(["-Zbuild-std=core,alloc"]);
291-
}
292272
}
293273

294274
if self.packages.is_empty() {

0 commit comments

Comments
 (0)