[WIP]

5 files changed, 2 insertions, 37 deletions

diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml
index 532216ba851..af199c757e0 100644
--- a/build_sysroot/Cargo.toml
+++ b/build_sysroot/Cargo.toml
@@ -5,16 +5,12 @@ version = "0.0.0"
 
 [dependencies]
 core = { path = "./sysroot_src/src/libcore" }
-compiler_builtins = "0.1"
-alloc = { path = "./sysroot_src/src/liballoc" }
-std = { path = "./sysroot_src/src/libstd" }
-
-alloc_system = { path = "./alloc_system" }
+compiler_builtins = { version = "0.1", features = ["rustc-dep-of-std"] }
 
 [patch.crates-io]
 rustc-std-workspace-core = { path = "./sysroot_src/src/tools/rustc-std-workspace-core" }
 rustc-std-workspace-alloc = { path = "./rustc-std-workspace-alloc" }
-#compiler_builtins = { path = "./compiler_builtins" }
+compiler_builtins = { path = "./compiler-builtins" }
 
 [profile.release]
 debug = true
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index 57752c402c5..ea5e4a169e5 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -4,8 +4,6 @@ cd $(dirname "$0")
 
 # Cleanup for previous run
 #     v Clean target dir except for build scripts and incremental cache
-rm -r target/*/{debug,release}/{build,deps,examples,libsysroot*,native} || true
-rm Cargo.lock 2>/dev/null || true
 rm -r sysroot 2>/dev/null || true
 
 # FIXME find a better way to get the target triple
diff --git a/build_sysroot/compiler-builtins b/build_sysroot/compiler-builtins
new file mode 160000
+Subproject 36da64f20e96206ac279f700586817c8abe3bdf
diff --git a/build_sysroot/compiler_builtins/Cargo.toml b/build_sysroot/compiler_builtins/Cargo.toml
deleted file mode 100644
index 724a637a201..00000000000
--- a/build_sysroot/compiler_builtins/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "compiler_builtins"
-# Make sure the `compiler_builtins` from crates.io doesn't take precedence over this
-# replacement by specifying a higher version than the one on crates.io.
-version = "0.1.100"
-authors = ["bjorn3 <bjorn3@users.noreply.github.com>"]
-edition = "2018"
-
-[lib]
-name = "compiler_builtins"
-path = "lib.rs"
-test = false
-doc = false
-
-[dependencies]
-core = { path = "../sysroot_src/src/libcore" }
-
-[features]
-rustc-dep-of-std = []
-c = []
diff --git a/build_sysroot/compiler_builtins/lib.rs b/build_sysroot/compiler_builtins/lib.rs
deleted file mode 100644
index 79a54a3a4b8..00000000000
--- a/build_sysroot/compiler_builtins/lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![feature(compiler_builtins, staged_api)]
-#![compiler_builtins]
-#![no_std]
-
-#![unstable(
-    feature = "compiler_builtins_lib",
-    reason = "Compiler builtins. Will never become stable.",
-    issue = "0"
-)]