Merge commit '266e96785ab71834b917bf474f130a6d8fdecd4b' into sync_cg_clif-2022-10-23

[rust.git] / build_sysroot / Cargo.toml

diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml
index 24feabb2226c343e803c8e480d09af68566836ae..d0e5fc4a3b9f12e19481adda1c2d63735d073556 100644 (file)
--- a/build_sysroot/Cargo.toml
+++ b/build_sysroot/Cargo.toml
@@ -1,27 +1,35 @@
 [package]
-authors = ["bjorn3 <bjorn3@users.noreply.github.com>"]
 name = "sysroot"
 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", features = ["panic_unwind", "backtrace"] }
-test = { path = "./sysroot_src/src/libtest" }
+core = { path = "./sysroot_src/library/core" }
+alloc = { path = "./sysroot_src/library/alloc" }
+std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
+test = { path = "./sysroot_src/library/test" }
 
-alloc_system = { path = "./alloc_system" }
+compiler_builtins = { version = "0.1.39", default-features = false, features = ["no-asm"] }
 
 [patch.crates-io]
-rustc-std-workspace-core = { path = "./sysroot_src/src/tools/rustc-std-workspace-core" }
-rustc-std-workspace-alloc = { path = "./sysroot_src/src/tools/rustc-std-workspace-alloc" }
-rustc-std-workspace-std = { path = "./sysroot_src/src/tools/rustc-std-workspace-std" }
+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-std = { path = "./sysroot_src/library/rustc-std-workspace-std" }
 
 [profile.dev]
-# FIXME On macOS statics and promoted constants have the wrong alignment. This causes a debug
-# assertion in `copy_nonoverlapping` to panic.
-debug-assertions = false
+lto = "off"
 
 [profile.release]
 debug = true
+incremental = true
+lto = "off"
+
+# Mandatory for correctly compiling compiler-builtins
+[profile.dev.package.compiler_builtins]
+debug-assertions = false
+overflow-checks = false
+codegen-units = 10000
+
+[profile.release.package.compiler_builtins]
 debug-assertions = false
+overflow-checks = false
+codegen-units = 10000