From 683c266f958db9acff705856f2c0aeb031d9782c Mon Sep 17 00:00:00 2001 From: Giovanni Bajo Date: Sun, 25 Feb 2018 11:32:59 +0100 Subject: [PATCH] build: add default GOROOT_BOOTSTRAP in Windows CL 57753 added support to make.bash and make.rc to default GOROOT_BOOTSTRAP to 'go env GOROOT'. This patch does the same in make.bat for Windows. Updates #18545 Fixes #28641 Change-Id: I9152cc5080ed219b4de5bad0bd12d7725422ee1a Reviewed-on: https://go-review.googlesource.com/c/go/+/96455 Reviewed-by: Alex Brainman --- src/make.bat | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/make.bat b/src/make.bat index 5dbde85564e9f..f7955ec88a948 100644 --- a/src/make.bat +++ b/src/make.bat @@ -61,7 +61,8 @@ del /F ".\pkg\runtime\runtime_defs.go" 2>NUL :: Set GOROOT for build. cd .. -set GOROOT=%CD% +set GOROOT_TEMP=%CD% +set GOROOT= cd src set vflag= if x%1==x-v set vflag=-v @@ -70,8 +71,25 @@ if x%3==x-v set vflag=-v if x%4==x-v set vflag=-v if not exist ..\bin\tool mkdir ..\bin\tool + +:: Calculating GOROOT_BOOTSTRAP +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 ( + if /I not %%i==%GOROOT_TEMP% ( + set GOROOT_BOOTSTRAP=%%i + ) + ) + ) +) if "x%GOROOT_BOOTSTRAP%"=="x" set GOROOT_BOOTSTRAP=%HOMEDRIVE%%HOMEPATH%\Go1.4 + +:bootstrapset if not exist "%GOROOT_BOOTSTRAP%\bin\go.exe" goto bootstrapfail +set GOROOT=%GOROOT_TEMP% +set GOROOT_TEMP= + echo Building Go cmd/dist using %GOROOT_BOOTSTRAP% if x%vflag==x-v echo cmd/dist setlocal