From 8f2a7f1e6a34c6741d8b878fce39fe27d25c8fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Mon, 11 Aug 2025 14:06:59 +0200
Subject: [PATCH 1/3] feat(build.rs): don't build core

---
 rftrace/build.rs    | 5 -----
 rust-toolchain.toml | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/rftrace/build.rs b/rftrace/build.rs
index 4832daa..84431b6 100755
--- a/rftrace/build.rs
+++ b/rftrace/build.rs
@@ -52,11 +52,6 @@ fn build_backend() {
     cmd.stdout(Stdio::inherit());
     cmd.stderr(Stdio::inherit());
 
-    cmd.args([
-        "-Zbuild-std=core",
-        "-Zbuild-std-features=compiler-builtins-mem",
-    ]);
-
     cmd.arg("--release");
 
     cmd.arg("--");
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index de9120f..2ca21b1 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,8 +1,8 @@
 [toolchain]
 channel = "nightly"
 components = [
-    "rust-src",
     "llvm-tools-preview",
     "rustfmt",
     "clippy",
 ]
+targets = ["x86_64-unknown-none"]

From 3dc4018a863cbd70f4a0209a204f1405b1e5061e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Mon, 11 Aug 2025 14:18:08 +0200
Subject: [PATCH 2/3] ci: don't force nightly

---
 .github/workflows/ci.yml | 8 +++++++-
 examples/c/makefile      | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c5d42c..53b726a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,6 +45,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install uftrace
       - uses: mkroening/rust-toolchain-toml@main
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: llvm-tools
       - name: Build
         run: make
       - name: Run
@@ -69,8 +72,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install uftrace
       - uses: mkroening/rust-toolchain-toml@main
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: llvm-tools
       - name: Build
-        run: cargo +nightly rustc -- -Zinstrument-mcount -C passes="ee-instrument<post-inline>"
+        run: cargo rustc -- -Zinstrument-mcount -C passes="ee-instrument<post-inline>"
       - name: Run
         run: |
           mkdir tracedir
diff --git a/examples/c/makefile b/examples/c/makefile
index 5e038c8..3ad1bff 100644
--- a/examples/c/makefile
+++ b/examples/c/makefile
@@ -2,10 +2,10 @@ default: out/debug/librftrace.a out/debug/librftrace_frontend_ffi.a
 	gcc main.c -p -pthread -ldl -lrftrace -lrftrace_frontend_ffi -Lout/debug/ -o test
 
 out/debug/librftrace.a:
-	cargo +nightly build --manifest-path ../../rftrace/Cargo.toml --target-dir out
+	cargo build --manifest-path ../../rftrace/Cargo.toml --target-dir out
 
 out/debug/librftrace_frontend_ffi.a:
-	cargo +nightly build --manifest-path ../../rftrace-frontend-ffi/Cargo.toml --target-dir out
+	cargo build --manifest-path ../../rftrace-frontend-ffi/Cargo.toml --target-dir out
 
 clean:
 	rm -r out

From 8efa450b1f5c534b53c2d4194ccfaaeee05cf41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Mon, 11 Aug 2025 13:27:59 +0200
Subject: [PATCH 3/3] feat: build the backend on stable Rust

---
 .github/workflows/ci.yml | 7 +------
 rftrace/build.rs         | 1 -
 rust-toolchain.toml      | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53b726a..738d109 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,8 +12,7 @@ jobs:
       RUSTFLAGS: -Dwarnings
     steps:
       - uses: actions/checkout@v4
-      # FIXME: use stable once rftrace supports stable
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@stable
         with:
           targets: x86_64-unknown-none
       - run: cargo clippy --all-features
@@ -45,9 +44,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install uftrace
       - uses: mkroening/rust-toolchain-toml@main
-      - uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: llvm-tools
       - name: Build
         run: make
       - name: Run
@@ -71,7 +67,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install uftrace
-      - uses: mkroening/rust-toolchain-toml@main
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: llvm-tools
diff --git a/rftrace/build.rs b/rftrace/build.rs
index 84431b6..18e2f0b 100755
--- a/rftrace/build.rs
+++ b/rftrace/build.rs
@@ -30,7 +30,6 @@ fn build_backend() {
     let target = "x86_64-unknown-none";
 
     let mut cmd = cargo();
-    cmd.arg("+nightly");
     cmd.arg("rustc");
 
     cmd.args(["--target", target]);
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 2ca21b1..37e1b61 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,4 @@
 [toolchain]
-channel = "nightly"
 components = [
     "llvm-tools-preview",
     "rustfmt",