Enable compiler-builtins no-asm feature using --features flag

This commit is contained in:
bjorn3 2023-05-28 17:57:49 +00:00
parent b9129c0d6b
commit 54eaa5382c
4 changed files with 2 additions and 4 deletions

View File

@ -270,7 +270,6 @@ name = "sysroot"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"alloc", "alloc",
"compiler_builtins",
"core", "core",
"proc_macro", "proc_macro",
"std", "std",

View File

@ -9,8 +9,6 @@ std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtra
test = { path = "./sysroot_src/library/test" } test = { path = "./sysroot_src/library/test" }
proc_macro = { path = "./sysroot_src/library/proc_macro" } proc_macro = { path = "./sysroot_src/library/proc_macro" }
compiler_builtins = { version = "0.1.87", default-features = false, features = ["no-asm"] }
[patch.crates-io] [patch.crates-io]
rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" } rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }
rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" } rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" }

View File

@ -1 +1 @@
#![no_std]

View File

@ -277,6 +277,7 @@ fn build_clif_sysroot_for_triple(
if channel == "release" { if channel == "release" {
build_cmd.arg("--release"); build_cmd.arg("--release");
} }
build_cmd.arg("--features").arg("std/compiler-builtins-no-asm");
build_cmd.arg("--locked"); build_cmd.arg("--locked");
build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif"); build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif");
if compiler.triple.contains("apple") { if compiler.triple.contains("apple") {