From eecef27140c90178fbbeb95c568d7118219e651d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Wed, 26 Nov 2025 13:20:02 +0100
Subject: [PATCH 1/2] feat(xtask): expect `CARGO_ENCODED_RUSTFLAGS` to be empty

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

diff --git a/xtask/src/build.rs b/xtask/src/build.rs
index 62e5f72a6f..19d2311be4 100644
--- a/xtask/src/build.rs
+++ b/xtask/src/build.rs
@@ -86,15 +86,11 @@ impl Build {
 	}
 
 	fn cargo_encoded_rustflags(&self) -> Result<String> {
-		let outer_rustflags = match env::var("CARGO_ENCODED_RUSTFLAGS") {
-			Ok(s) => Some(s),
-			Err(VarError::NotPresent) => None,
-			Err(err) => return Err(err.into()),
-		};
-		let mut rustflags = outer_rustflags
-			.as_deref()
-			.map(|s| vec![s])
-			.unwrap_or_default();
+		assert_eq!(
+			env::var("CARGO_ENCODED_RUSTFLAGS"),
+			Err(VarError::NotPresent)
+		);
+		let mut rustflags = Vec::new();
 
 		if self.instrument_mcount {
 			rustflags.push("-Zinstrument-mcount");

From 3488a0039926a968ef886df81d6d9c12f2643d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Wed, 26 Nov 2025 14:21:22 +0100
Subject: [PATCH 2/2] feat(xtask): add `HERMIT_ENCODED_RUSTFLAGS` and
 `HERMIT_RUSTFLAGS`

---
 xtask/src/build.rs | 56 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/xtask/src/build.rs b/xtask/src/build.rs
index 19d2311be4..8f9d6d4cbd 100644
--- a/xtask/src/build.rs
+++ b/xtask/src/build.rs
@@ -86,22 +86,25 @@ impl Build {
 	}
 
 	fn cargo_encoded_rustflags(&self) -> Result<String> {
-		assert_eq!(
-			env::var("CARGO_ENCODED_RUSTFLAGS"),
-			Err(VarError::NotPresent)
-		);
-		let mut rustflags = Vec::new();
+		let mut rustflags = hermit_rustflags_from_env().unwrap_or_default();
 
 		if self.instrument_mcount {
-			rustflags.push("-Zinstrument-mcount");
-			rustflags.push("-Cpasses=ee-instrument<post-inline>");
+			rustflags.push("-Zinstrument-mcount".to_owned());
+			rustflags.push("-Cpasses=ee-instrument<post-inline>".to_owned());
 		}
 
 		if self.randomize_layout {
-			rustflags.push("-Zrandomize-layout")
+			rustflags.push("-Zrandomize-layout".to_owned())
 		}
 
-		rustflags.extend(self.cargo_build.artifact.arch.rustflags());
+		rustflags.extend(
+			self.cargo_build
+				.artifact
+				.arch
+				.rustflags()
+				.iter()
+				.map(|&s| s.to_owned()),
+		);
 
 		Ok(rustflags.join("\x1f"))
 	}
@@ -119,3 +122,38 @@ impl Build {
 		Ok(())
 	}
 }
+
+/// Gets Hermit-specific compiler flags from environment variables.
+///
+/// Adapted from Cargo's [`rustflags_from_env`](https://github.com/rust-lang/cargo/blob/2a7c4960677971f88458b0f8b461a866836dff59/src/cargo/core/compiler/build_context/target_info.rs#L815-L839).
+fn hermit_rustflags_from_env() -> Option<Vec<String>> {
+	match env::var("HERMIT_ENCODED_RUSTFLAGS") {
+		Ok(a) => {
+			if a.is_empty() {
+				return Some(Vec::new());
+			}
+			return Some(a.split('\x1f').map(str::to_string).collect());
+		}
+		Err(VarError::NotPresent) => {}
+		Err(VarError::NotUnicode(a)) => {
+			panic!("HERMIT_ENCODED_RUSTFLAGS did not contain valid unicode data: {a:?}");
+		}
+	}
+
+	match env::var("HERMIT_RUSTFLAGS") {
+		Ok(a) => {
+			let args = a
+				.split(' ')
+				.map(str::trim)
+				.filter(|s| !s.is_empty())
+				.map(str::to_string);
+			return Some(args.collect());
+		}
+		Err(VarError::NotPresent) => {}
+		Err(VarError::NotUnicode(a)) => {
+			panic!("HERMIT_RUSTFLAGS did not contain valid unicode data: {a:?}");
+		}
+	}
+
+	None
+}