diff --git a/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake b/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
index 8f82678d4..cce7ce4c2 100644
--- a/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
+++ b/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
@@ -735,7 +735,7 @@ set (ELF2HEX --i32combined --output "${OUT_DIR}/${HEX_FILE}" "${OUT_DIR}/$<TARGE
 set (ELF2BIN --bin --output "${OUT_DIR}/${BIN_FILE}" "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGET_PROPERTY:${TARGET},SUFFIX>")
 
 # Linker Map file generation
-set (LD_MAP --map --list=${OUT_DIR}/${LD_MAP_FILE})
+set (LD_MAP --map --list="${OUT_DIR}/${LD_MAP_FILE}")
 
 # Set CMake variables for toolchain initialization
 set(CMAKE_C_FLAGS_INIT "${CC_CPU}")
diff --git a/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake b/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
index 6684f88d5..ff82b5405 100644
--- a/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
+++ b/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
@@ -438,7 +438,7 @@ set (ELF2HEX -O ihex "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGE
 set (ELF2BIN -O binary "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGET_PROPERTY:${TARGET},SUFFIX>" "${OUT_DIR}/${BIN_FILE}")
 
 # Linker Map file generation
-set (LD_MAP -Wl,-Map=${OUT_DIR}/${LD_MAP_FILE})
+set (LD_MAP -Wl,-Map="${OUT_DIR}/${LD_MAP_FILE}")
 
 # Set CMake variables for toolchain initialization
 set(CMAKE_C_FLAGS_INIT "${CC_CPU}")
diff --git a/tools/buildmgr/cbuildgen/config/CLANG_TI.4.0.1.cmake b/tools/buildmgr/cbuildgen/config/CLANG_TI.4.0.1.cmake
index a7bc5d751..ceee4d1e2 100644
--- a/tools/buildmgr/cbuildgen/config/CLANG_TI.4.0.1.cmake
+++ b/tools/buildmgr/cbuildgen/config/CLANG_TI.4.0.1.cmake
@@ -205,7 +205,7 @@ set (ELF2HEX -O ihex "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGE
 set (ELF2BIN -O binary "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGET_PROPERTY:${TARGET},SUFFIX>" "${OUT_DIR}/${BIN_FILE}")
 
 # Linker Map file generation
-set (LD_MAP -Wl,--map_file=${OUT_DIR}/${LD_MAP_FILE})
+set (LD_MAP -Wl,--map_file="${OUT_DIR}/${LD_MAP_FILE}")
 
 # Set CMake variables for toolchain initialization
 set(CMAKE_C_FLAGS_INIT "${CC_CPU}")
diff --git a/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake b/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
index 2cba06e62..6204b4876 100644
--- a/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
+++ b/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
@@ -321,7 +321,7 @@ set (ELF2HEX -O ihex "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGE
 set (ELF2BIN -O binary "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGET_PROPERTY:${TARGET},SUFFIX>" "${OUT_DIR}/${BIN_FILE}")
 
 # Linker Map file generation
-set (LD_MAP -Wl,-Map=${OUT_DIR}/${LD_MAP_FILE})
+set (LD_MAP -Wl,-Map="${OUT_DIR}/${LD_MAP_FILE}")
 
 # Set CMake variables for toolchain initialization
 set(CMAKE_C_FLAGS_INIT "${CC_CPU}")
diff --git a/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake b/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
index 64a21a287..48e23f97f 100644
--- a/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
+++ b/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
@@ -327,7 +327,7 @@ set (ELF2HEX --silent --ihex "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME
 set (ELF2BIN --silent --bin "${OUT_DIR}/$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>$<TARGET_PROPERTY:${TARGET},SUFFIX>" "${OUT_DIR}/${BIN_FILE}")
 
 # Linker Map file generation
-set (LD_MAP --map=${OUT_DIR}/${LD_MAP_FILE})
+set (LD_MAP --map="${OUT_DIR}/${LD_MAP_FILE}")
 
 # Set CMake variables for toolchain initialization
 set(CMAKE_SYSTEM_NAME Generic)