From 51040cc4ebf95161d87d9ccf20bd4d377d6246e7 Mon Sep 17 00:00:00 2001
From: Maximilian Gerhardt <maximilian.gerhardt@rub.de>
Date: Mon, 28 Mar 2022 14:48:13 +0200
Subject: [PATCH] Fix linking failure for space in path in PlatformIO builder
 scripts (#6464)

Co-authored-by: Me No Dev <me-no-dev@users.noreply.github.com>
---
 tools/platformio-build-esp32.py   | 2 +-
 tools/platformio-build-esp32c3.py | 2 +-
 tools/platformio-build-esp32s2.py | 2 +-
 tools/platformio-build-esp32s3.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/platformio-build-esp32.py b/tools/platformio-build-esp32.py
index cfc22c00c..ecbad8abc 100644
--- a/tools/platformio-build-esp32.py
+++ b/tools/platformio-build-esp32.py
@@ -112,7 +112,7 @@ env.Append(
         "-u", "newlib_include_pthread_impl",
         "-u", "newlib_include_assert_impl",
         "-u", "__cxa_guard_dummy",
-        '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+        '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
     ],
 
     CPPPATH=[
diff --git a/tools/platformio-build-esp32c3.py b/tools/platformio-build-esp32c3.py
index 6ab0fe082..d798838d7 100644
--- a/tools/platformio-build-esp32c3.py
+++ b/tools/platformio-build-esp32c3.py
@@ -111,7 +111,7 @@ env.Append(
         "-u", "newlib_include_pthread_impl",
         "-u", "newlib_include_assert_impl",
         "-u", "__cxa_guard_dummy",
-        '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+        '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
     ],
 
     CPPPATH=[
diff --git a/tools/platformio-build-esp32s2.py b/tools/platformio-build-esp32s2.py
index 8b89c8e3d..54a4617ff 100644
--- a/tools/platformio-build-esp32s2.py
+++ b/tools/platformio-build-esp32s2.py
@@ -108,7 +108,7 @@ env.Append(
         "-u", "newlib_include_pthread_impl",
         "-u", "newlib_include_assert_impl",
         "-u", "__cxa_guard_dummy",
-        '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+        '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
     ],
 
     CPPPATH=[
diff --git a/tools/platformio-build-esp32s3.py b/tools/platformio-build-esp32s3.py
index 49dbb1131..4762af61e 100644
--- a/tools/platformio-build-esp32s3.py
+++ b/tools/platformio-build-esp32s3.py
@@ -108,7 +108,7 @@ env.Append(
         "-u", "newlib_include_pthread_impl",
         "-u", "newlib_include_assert_impl",
         "-u", "__cxa_guard_dummy",
-        '-Wl,-Map="%s"' % join("$BUILD_DIR", basename(env.subst("${PROJECT_DIR}.map")))
+        '-Wl,-Map="%s"' % join("${BUILD_DIR}", "${PROGNAME}.map")
     ],
 
     CPPPATH=[
-- 
GitLab