From 2c69d3356d3fc02242adf2f520e74937d40c95a6 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <leonard@hecker.io>
Date: Tue, 14 Oct 2025 12:25:09 +0200
Subject: [PATCH] Fix Rust nightly builds

---
 .cargo/release-nightly.toml | 16 ++++++++++++++++
 README.md                   |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 .cargo/release-nightly.toml

diff --git a/.cargo/release-nightly.toml b/.cargo/release-nightly.toml
new file mode 100644
index 000000000000..f294dca85b6a
--- /dev/null
+++ b/.cargo/release-nightly.toml
@@ -0,0 +1,16 @@
+[profile.release]
+panic = "immediate-abort"
+
+[target.'cfg(all(target_os = "windows", target_env = "msvc"))']
+rustflags = [
+    "-Ctarget-feature=+crt-static",
+    "-Clink-args=/DEFAULTLIB:ucrt.lib",
+    "-Clink-args=/NODEFAULTLIB:vcruntime.lib",
+    "-Clink-args=/NODEFAULTLIB:msvcrt.lib",
+    "-Clink-args=/NODEFAULTLIB:libucrt.lib",
+]
+
+[unstable]
+panic-immediate-abort = true
+build-std = ["std", "panic_abort"]
+build-std-features = ["default", "optimize_for_size"]
diff --git a/README.md b/README.md
index 3cc9702711f7..623c6dfd59ce 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,9 @@ winget install Microsoft.Edit
 * Install the nightly toolchain: `rustup install nightly`
   * Alternatively, set the environment variable `RUSTC_BOOTSTRAP=1`
 * Clone the repository
-* For a release build, run: `cargo build --config .cargo/release.toml --release`
+* For a release build, run:
+  * Rust 1.90 or earlier: `cargo build --config .cargo/release.toml --release`
+  * otherwise: `cargo build --config .cargo/release-nightly.toml --release`
 
 ### Build Configuration