Noratrieb/does-it-build
1
0
Fork 0
mirror of https://github.com/Noratrieb/does-it-build.git synced 2026-01-14 18:35:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use cargo check -Zbuild-std instead of cargo miri setup

Browse source 
This should be more reliable (not building with `cfg(miri)` and more
accurately knowing whether a target supports std).

Known targets affected by this change:
- cygwin: should now build since it only breaks in `cfg(miri)`
- i686-pc-nto-qnx700: officially doesn't support std

closes #4
This commit is contained in:
nora 2025-07-05 14:21:26 +02:00
parent 0be7b4c981
commit df486c20f8
7 changed files with 85 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/build.rs
View file

@ -61,7 +61,11 @@ pub async fn background_builder(db: Db) -> Result<()> {
loop {
if let Err(err) = background_builder_inner(&db).await {
error!("error in background builder: {err}");
error!(
?err,
"error in background builder, waiting for an hour before retrying: {err}"
);
tokio::time::sleep(Duration::from_secs(3600)).await;
}
}
}
@ -145,20 +149,7 @@ async fn install_toolchain(toolchain: &Toolchain, mode: BuildMode) -> Result<()>
if !result.status.success() {
bail!("rustup failed: {:?}", String::from_utf8(result.stderr));
}
if mode == BuildMode::MiriStd {
let result = Command::new("rustup")
.arg("component")
.arg("add")
.arg("miri")
.arg("--toolchain")
.arg(&toolchain.0)
.output()
.await
.wrap_err("failed to spawn rustup")?;
if !result.status.success() {
bail!("rustup failed: {:?}", String::from_utf8(result.stderr));
}
}
Ok(())
}
@ -289,23 +280,24 @@ async fn build_target(
) -> Result<BuildResult> {
let mut rustflags = None;
let output = match mode {
let init = Command::new("cargo")
.args(["init", "--lib", "--name", "target-test"])
.current_dir(tmpdir)
.output()
.await
.wrap_err("spawning cargo init")?;
if !init.status.success() {
bail!("init failed: {}", String::from_utf8(init.stderr)?);
}
let librs = tmpdir.join("src").join("lib.rs");
std::fs::write(&librs, "#![no_std]\n")
.wrap_err_with(|| format!("writing to {}", librs.display()))?;
let mut cmd = Command::new("cargo");
match mode {
BuildMode::Core => {
let init = Command::new("cargo")
.args(["init", "--lib", "--name", "target-test"])
.current_dir(tmpdir)
.output()
.await
.wrap_err("spawning cargo init")?;
if !init.status.success() {
bail!("init failed: {}", String::from_utf8(init.stderr)?);
}
let librs = tmpdir.join("src").join("lib.rs");
std::fs::write(&librs, "#![no_std]\n")
.wrap_err_with(|| format!("writing to {}", librs.display()))?;
let mut cmd = Command::new("cargo");
cmd.arg(format!("+{toolchain}"))
.args(["build", "-Zbuild-std=core", "--release"])
.args(["--target", target]);
@ -319,23 +311,20 @@ async fn build_target(
cmd.env("RUSTFLAGS", &flags);
rustflags = Some(flags);
}
cmd.current_dir(tmpdir)
.output()
.await
.wrap_err("spawning cargo build")?
}
BuildMode::MiriStd => Command::new("cargo")
.arg(format!("+{toolchain}"))
.args(["miri", "setup"])
.args(["--target", target])
.current_dir(tmpdir)
.env("MIRI_SYSROOT", tmpdir)
.output()
.await
.wrap_err("spawning cargo build")?,
BuildMode::Std => {
cmd.arg(format!("+{toolchain}"))
.args(["check", "-Zbuild-std"])
.args(["--target", target]);
}
};
let output = cmd
.current_dir(tmpdir)
.output()
.await
.wrap_err("spawning cargo build")?;
let stderr = String::from_utf8(output.stderr).wrap_err("cargo stderr utf8")?;
let status = if output.status.success() {