From 7361fe27f993a17305f585a814c32fed3c15c2da Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@users.noreply.github.com>
Date: Mon, 6 Mar 2023 21:36:44 -0500
Subject: [PATCH] Disable cwd remapping if debug build is requested in
 build-sbf (#30601)

CWD remapping removes absolute path prefixes from the path strings in
generated binary files. The paths are needed for source level
debugging.
---
 sdk/cargo-build-sbf/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/cargo-build-sbf/src/main.rs b/sdk/cargo-build-sbf/src/main.rs
index 5a7a44158..a738dfcfd 100644
--- a/sdk/cargo-build-sbf/src/main.rs
+++ b/sdk/cargo-build-sbf/src/main.rs
@@ -699,7 +699,7 @@ fn build_sbf_package(config: &Config, target_directory: &Path, package: &cargo_m
     let target_rustflags = env::var(cargo_target).ok();
     let mut target_rustflags = Cow::Borrowed(target_rustflags.as_deref().unwrap_or_default());
     target_rustflags = Cow::Owned(format!("{} {}", &rustflags, &target_rustflags));
-    if config.remap_cwd {
+    if config.remap_cwd && !config.debug {
         target_rustflags = Cow::Owned(format!("{} -Zremap-cwd-prefix=", &target_rustflags));
     }
     if config.debug {