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

Author: bjorn3

build_sysroot/Cargo.lock

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

build_sysroot/Cargo.toml

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

build_sysroot/src/lib.rs

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