Skip to content

Commit 0f23751

Browse files
committed
cmd/racebuild: tweak compilers used for windows syso build
Revise the recipe for building a windows race syso slightly to use the existing compilers on the windows machine (in C:\godep\gcc64\bin) as opposed to downloading GCC 5.X via "choco install". This requires updating PATH following the refresh env. Updates golang/go#35006. Updates golang/go#53539. Change-Id: I14c8491159f421f688f8d4b7c84250768d69ea42 Reviewed-on: https://go-review.googlesource.com/c/build/+/414475 Run-TryBot: Than McIntosh <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Cherry Mui <[email protected]>
1 parent 15934aa commit 0f23751

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

cmd/racebuild/racebuild.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,12 @@ cp llvm-project/compiler-rt/lib/tsan/go/race_netbsd_amd64.syso go/src/runtime/ra
237237
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "[System.net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
238238
choco install git -y
239239
if %errorlevel% neq 0 exit /b %errorlevel%
240-
choco install mingw --version 5.3.0 -y
241-
if %errorlevel% neq 0 exit /b %errorlevel%
242240
call refreshenv
241+
echo adding back in compiler path
242+
set PATH=C:\go\bin;%PATH%;C:\godep\gcc64\bin
243+
rem make sure we have a working copy of gcc
244+
gcc --version
245+
if %errorlevel% neq 0 exit /b %errorlevel%
243246
git clone https://go.googlesource.com/go
244247
if %errorlevel% neq 0 exit /b %errorlevel%
245248
cd go

0 commit comments

Comments
 (0)