From 288ac8363254e4c2b3ee566d38ff5f03dfacc57d Mon Sep 17 00:00:00 2001
From: Gleb <gleb@stellar.org>
Date: Mon, 9 Dec 2024 10:34:18 -0800
Subject: [PATCH] revert implementation

---
 cmd/crates/soroban-test/tests/it/build.rs      | 2 +-
 cmd/soroban-cli/src/commands/contract/build.rs | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cmd/crates/soroban-test/tests/it/build.rs b/cmd/crates/soroban-test/tests/it/build.rs
index 9269abd92..b6de85dd6 100644
--- a/cmd/crates/soroban-test/tests/it/build.rs
+++ b/cmd/crates/soroban-test/tests/it/build.rs
@@ -186,7 +186,7 @@ fn with_flags(expected: &str) -> String {
             .split("\n")
             .map(|x| {
                 format!(
-                    "CARGO_BUILD_RUSTFLAGS='--remap-path-prefix {}=' {}",
+                    "CARGO_BUILD_RUSTFLAGS=--remap-path-prefix={}= {}",
                     registry_prefix, x
                 )
             })
diff --git a/cmd/soroban-cli/src/commands/contract/build.rs b/cmd/soroban-cli/src/commands/contract/build.rs
index 8377c3c3c..ac1aa1302 100644
--- a/cmd/soroban-cli/src/commands/contract/build.rs
+++ b/cmd/soroban-cli/src/commands/contract/build.rs
@@ -323,9 +323,8 @@ impl Cmd {
 /// debugging is expected to be minimal.
 ///
 /// This works by setting the `CARGO_BUILD_RUSTFLAGS` environment variable,
-/// with an appropriate
-/// [`--remap-path-prefix`](https://doc.rust-lang.org/rustc/command-line-arguments.html#--remap-path-prefix-remap-source-names-in-output)
-/// option. It preserves the values of an existing `CARGO_BUILD_RUSTFLAGS` environment variable.
+/// with appropriate `--remap-path-prefix` option. It preserves the values of an
+/// existing `CARGO_BUILD_RUSTFLAGS` environment variable.
 ///
 /// This must be done some via some variation of `RUSTFLAGS` and not as
 /// arguments to `cargo rustc` because the latter only applies to the crate
@@ -379,11 +378,9 @@ fn make_rustflags_to_remap_absolute_paths(print: &Print) -> Result<Option<String
     }
 
     let registry_prefix = format!("{cargo_home}/registry/src/");
-    let new_rustflag = format!("{registry_prefix}=");
+    let new_rustflag = format!("--remap-path-prefix={registry_prefix}=");
 
     let mut rustflags = get_rustflags().unwrap_or_default();
-    // --remap-path-prefix is separated by space with the arguments
-    rustflags.push("--remap-path-prefix".to_string());
     rustflags.push(new_rustflag);
 
     let rustflags = rustflags.join(" ");