mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rustup to rustc 1.69.0-nightly (0416b1a6f 2023-02-14)

Browse Source
This commit is contained in:
bjorn3 2023-02-17 18:42:14 +01:00
parent afcdf57c00
commit 9491031f9a
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_sysroot/Cargo.toml
View File

@ -8,7 +8,8 @@ alloc = { path = "./sysroot_src/library/alloc" }
std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
test = { path = "./sysroot_src/library/test" }
compiler_builtins = { version = "0.1.39", default-features = false, features = ["no-asm"] }
# FIXME allow 0.1.87 and later once #1353 is fixed
compiler_builtins = { version = "=0.1.86", default-features = false, features = ["no-asm"] }
[patch.crates-io]
rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }

1
build_system/build_sysroot.rs
View File

@ -247,6 +247,7 @@ fn build_clif_sysroot_for_triple(
if channel == "release" {
build_cmd.arg("--release");
}
build_cmd.arg("--locked");
build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif");
if compiler.triple.contains("apple") {
build_cmd.env("CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO", "packed");

26
patches/0029-sysroot-Downgrade-compiler-builtins-to-0.1.86.patch Normal file
View File

@ -0,0 +1,26 @@
From ff23f6113098987318b674088b924e22750be18c Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 17 Feb 2023 18:37:48 +0100
Subject: [PATCH] Downgrade compiler-builtins to 0.1.86
0.1.87 doesn't work on Windows when using cg_clif
---
library/std/Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
index 349cd91..300f812 100644
--- a/library/std/Cargo.toml
+++ b/library/std/Cargo.toml
@@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" }
core = { path = "../core" }
libc = { version = "0.2.138", default-features = false, features = ['rustc-dep-of-std'] }
-compiler_builtins = { version = "0.1.87" }
+compiler_builtins = { version = "0.1.86" }
profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" }
hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }
--
2.26.2.7.g19db9cfb68

2
rust-toolchain
View File

@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2023-02-14"
channel = "nightly-2023-02-15"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]