make.bat: properly handle directories with spaces

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/5797079

diff --git a/src/make.bat b/src/make.bat
index 8bb9262c58e56f3d69e06b8980b5b87a8200ea42..9b0ab6920a453ef42140a6a8627771ccbeda9b37 100644 (file)
--- a/src/make.bat
+++ b/src/make.bat
@@ -46,8 +46,8 @@ if x%1==x--no-clean set buildall=
 .\cmd\dist\dist bootstrap %buildall% -v
 if errorlevel 1 goto fail
 :: Delay move of dist tool to now, because bootstrap cleared tool directory.
-move .\cmd\dist\dist.exe %GOTOOLDIR%\dist.exe
-%GOTOOLDIR%\go_bootstrap clean -i std
+move .\cmd\dist\dist.exe "%GOTOOLDIR%\dist.exe"
+"%GOTOOLDIR%\go_bootstrap" clean -i std
 echo.
 
 if not %GOHOSTARCH% == %GOARCH% goto localbuild
@@ -59,20 +59,20 @@ echo # Building tools for local system. %GOHOSTOS%/%GOHOSTARCH%
 setlocal
 set GOOS=%GOHOSTOS%
 set GOARCH=%GOHOSTARCH%
-%GOTOOLDIR%\go_bootstrap install -v std
+"%GOTOOLDIR%\go_bootstrap" install -v std
 endlocal
 if errorlevel 1 goto fail
 echo.
 
 :mainbuild
 echo # Building packages and commands.
-%GOTOOLDIR%\go_bootstrap install -a -v std
+"%GOTOOLDIR%\go_bootstrap" install -a -v std
 if errorlevel 1 goto fail
-del %GOTOOLDIR%\go_bootstrap.exe
+del "%GOTOOLDIR%\go_bootstrap.exe"
 echo.
 
 if x%1==x--no-banner goto nobanner
-%GOTOOLDIR%\dist banner
+"%GOTOOLDIR%\dist" banner
 :nobanner
 
 goto end