Skip to content

remove handling for old compiler-builtins versions #32

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.

Sign up for GitHub

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
RalfJung merged 1 commit into from
Apr 1, 2026
Merged

remove handling for old compiler-builtins versions #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 2 additions & 19 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,38 +299,21 @@ impl<'a> SysrootBuilder<'a> {

/// Generate the contents of the manifest file for the sysroot build.
fn gen_manifest(&self, src_dir: &Path) -> String {
let have_builtins_crate = src_dir.join("compiler-builtins").exists();
let crates = match &self.config {
// As long as the sysroot has a patch for compiler_builtins, we need to include it in the
// NoStd variant explicitly.
SysrootConfig::NoStd if have_builtins_crate => format!(
SysrootConfig::NoStd => format!(
r#"
[dependencies.core]
path = {src_dir_core:?}
[dependencies.alloc]
path = {src_dir_alloc:?}
[dependencies.compiler_builtins]
path = {src_dir_builtins:?}
features = ["rustc-dep-of-std", "mem"]
features = ["compiler-builtins", "mem"]
"#,
src_dir_core = src_dir.join("core"),
src_dir_alloc = src_dir.join("alloc"),
src_dir_builtins = src_dir.join("compiler-builtins").join("compiler-builtins"),
),
// Fallback for old rust without in-tree `compiler-builtins`.
SysrootConfig::NoStd => format!(
r#"
[dependencies.core]
path = {src_dir_core:?}
[dependencies.alloc]
path = {src_dir_alloc:?}
[dependencies.compiler_builtins]
version = "*"
features = ["rustc-dep-of-std", "mem"]
"#,
src_dir_core = src_dir.join("core"),
src_dir_alloc = src_dir.join("alloc"),
),
SysrootConfig::WithStd { std_features } => format!(
r#"
[dependencies.std]
Expand Down