From: Kevin Parsons <kevpar@microsoft.com>
Date: Thu, 19 Jan 2023 07:40:12 +0000 (+0000)
Subject: make.bat: support existing toolchain paths with spaces
X-Git-Tag: go1.21rc1~1897
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f89badf6b448974296d7d05bd7d140d3e5ba4683;p=gostls13.git

make.bat: support existing toolchain paths with spaces

Previously if the default go toolchain (from "where go") contained spaces, then running make.bat would fail.

Fixes it to correctly treat paths with spaces. This is especially useful given that the default Go install path is under "C:\Program Files".

Fixes #57918

Change-Id: Icacf8dd5178b608225f02e4a11a8753d78bed262
GitHub-Last-Rev: 4cd8a790e41353bb6bb2bfc36db1013ab0dcae6d
GitHub-Pull-Request: golang/go#57836
Reviewed-on: https://go-review.googlesource.com/c/go/+/462275
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Quim Muntal <quimmuntal@gmail.com>
Run-TryBot: Quim Muntal <quimmuntal@gmail.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
---

diff --git a/src/make.bat b/src/make.bat
index 104fb485b4..814d12c300 100644
--- a/src/make.bat
+++ b/src/make.bat
@@ -73,7 +73,7 @@ if not exist ..\bin\tool mkdir ..\bin\tool
 if not "x%GOROOT_BOOTSTRAP%"=="x" goto bootstrapset
 for /f "tokens=*" %%g in ('where go 2^>nul') do (
 	if "x%GOROOT_BOOTSTRAP%"=="x" (
-		for /f "tokens=*" %%i in ('%%g env GOROOT 2^>nul') do (
+		for /f "tokens=*" %%i in ('"%%g" env GOROOT 2^>nul') do (
 			if /I not "%%i"=="%GOROOT_TEMP%" (
 				set GOROOT_BOOTSTRAP=%%i
 			)