MSYS2: Fix environment init when dev root folder

is a drive root
pal1000 · Nov 9, 2023 · 54d053a · 54d053a
1 parent 834b609
commit 54d053a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/buildscript/modules/runmsys.cmd b/buildscript/modules/runmsys.cmd
@@ -3,6 +3,6 @@
 @echo path ^= %USERPROFILE:\=\\%\\.gitconfig
 )>"%msysloc%\home\%%a\.gitconfig"
 @set CD=
-@IF %gitstate% GTR 0 echo PATH^=${PATH}^:${gitloc};cd "%CD%";%*  >"%devroot%\%projectname%\buildscript\assets\temp.sh"
-@IF %gitstate% EQU 0 echo cd "%CD%";%*  >"%devroot%\%projectname%\buildscript\assets\temp.sh"
+@IF %gitstate% GTR 0 echo PATH^=${PATH}^:${gitloc};cd "%CD:\=\\%";%*  >"%devroot%\%projectname%\buildscript\assets\temp.sh"
+@IF %gitstate% EQU 0 echo cd "%CD:\=\\%";%*  >"%devroot%\%projectname%\buildscript\assets\temp.sh"
 @"%msysloc%\usr\bin\bash.exe" -l "%devroot%\%projectname%\buildscript\assets\temp.sh"
diff --git a/releasenotes.md b/releasenotes.md
@@ -2,7 +2,8 @@
 - MSVC: Support building Mesa3D with MSYS2 flex and bison.
 - MSVC build: Update DirectX headers to what is expected to be 1.611.1 stable;
 - Misc/CMD syntax: Improve handling scenario where development root folder is a disk drive root;
-- Misc/CMD syntax: Fix 2 spots where unicode path support is missing.
+- Misc/CMD syntax: Fix 2 spots where quoted path support is missing;
+- MSYS2: Fix environment init when development root folder is a disk drive root.
 # 23.3.0-rc2
 ### Build script
 - CLI: Make prompt for Ninja build fit in one line at 800x600 resolution.