From 702de6d4817810ae7fffec0f5afa1edc1cfcc89c Mon Sep 17 00:00:00 2001
From: Scott Andrews <scott@andrews.me>
Date: Wed, 5 Aug 2026 19:42:37 -0400
Subject: [PATCH] fix(rust): restore `cabi_realloc` for
 `wasm32-unknown-unknown`

`cabi_realloc` was switched to only be added for `p1` targets instead of
not being added for `p2` targets. This causes modules built with
`wasm32-unknown-unknown` and then enriched into a component with
`wasm-tools component new` to fail.

Signed-off-by: Scott Andrews <scott@andrews.me>
---
 crates/guest-rust/src/rt/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/guest-rust/src/rt/mod.rs b/crates/guest-rust/src/rt/mod.rs
index c5696f928..349f8006a 100644
--- a/crates/guest-rust/src/rt/mod.rs
+++ b/crates/guest-rust/src/rt/mod.rs
@@ -111,7 +111,7 @@ impl<K: core::hash::Hash + Eq, V> WitMap<K, V> for std::collections::HashMap<K,
 }
 
 /// For more information about this see `./ci/rebuild-libwit-bindgen-cabi.sh`.
-#[cfg(target_env = "p1")]
+#[cfg(any(target_env = "p1", target_env = ""))]
 mod wit_bindgen_cabi_realloc;
 
 /// This function is called from generated bindings and will be deleted by
@@ -122,7 +122,7 @@ mod wit_bindgen_cabi_realloc;
 ///
 /// For more information about this see `./ci/rebuild-libwit-bindgen-cabi.sh`.
 pub fn maybe_link_cabi_realloc() {
-    #[cfg(target_env = "p1")]
+    #[cfg(any(target_env = "p1", target_env = ""))]
     {
         unsafe extern "C" {
             fn cabi_realloc(
@@ -153,7 +153,7 @@ pub fn maybe_link_cabi_realloc() {
 /// `cabi_realloc` module above. It's otherwise never explicitly called.
 ///
 /// For more information about this see `./ci/rebuild-libwit-bindgen-cabi.sh`.
-#[cfg(target_env = "p1")]
+#[cfg(any(target_env = "p1", target_env = ""))]
 pub unsafe fn cabi_realloc(
     old_ptr: *mut u8,
     old_len: usize,