From 5814f54591a239a88768ceb21deaef48a3c867c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Sun, 16 Aug 2026 12:21:51 +0200
Subject: [PATCH] refactor(xtask): use `CARGO_ENCODED_RUSTFLAGS` for hermit-rs

---
 xtask/src/ci/rs.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/xtask/src/ci/rs.rs b/xtask/src/ci/rs.rs
index 3be615aa16..09106dd9aa 100644
--- a/xtask/src/ci/rs.rs
+++ b/xtask/src/ci/rs.rs
@@ -57,15 +57,19 @@ impl Rs {
 			self.cargo_build.features.push("hermit/smp".to_owned());
 		}
 
-		let mut cargo = crate::cargo();
+		let mut rustflags = Vec::new();
 
 		if self.package.contains("rftrace") {
-			cargo.env(
-				"RUSTFLAGS",
-				"-Zinstrument-mcount -Cpasses=ee-instrument<post-inline>",
-			);
+			rustflags.push("-Zinstrument-mcount");
+			rustflags.push("-Cpasses=ee-instrument<post-inline>");
 		};
 
+		let mut cargo = crate::cargo();
+
+		if !rustflags.is_empty() {
+			cargo.env("CARGO_ENCODED_RUSTFLAGS", rustflags.join("\x1f"));
+		}
+
 		cargo
 			.current_dir(super::parent_root())
 			.arg("build")