diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock
index ef99acb8211..934665a0537 100644
--- a/build_sysroot/Cargo.lock
+++ b/build_sysroot/Cargo.lock
@@ -270,7 +270,6 @@ name = "sysroot"
 version = "0.0.0"
 dependencies = [
  "alloc",
- "compiler_builtins",
  "core",
  "proc_macro",
  "std",
diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml
index ea9d1c8df1c..194a5f27275 100644
--- a/build_sysroot/Cargo.toml
+++ b/build_sysroot/Cargo.toml
@@ -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" }
diff --git a/build_sysroot/src/lib.rs b/build_sysroot/src/lib.rs
index 0c9ac1ac8e4..8b137891791 100644
--- a/build_sysroot/src/lib.rs
+++ b/build_sysroot/src/lib.rs
@@ -1 +1 @@
-#![no_std]
+
diff --git a/build_system/build_sysroot.rs b/build_system/build_sysroot.rs
index 7ceda34bfac..5c1e30d4eef 100644
--- a/build_system/build_sysroot.rs
+++ b/build_system/build_sysroot.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") {