| diff -urN go-1.7.4.orig/src/make.bat go-1.7.4/src/make.bat |
| --- go-1.7.4.orig/src/make.bat 2017-01-22 15:14:03.131453100 +0000 |
| +++ go-1.7.4/src/make.bat 2017-01-22 15:16:20.116024400 +0000 |
| @@ -35,7 +35,9 @@ |
| :: FC: Command line to run to compile Fortran code. |
| :: This is used by cgo. Default is "gfortran". |
| |
| +if "%GO_BUILD_VERBOSE%"=="1" goto :skipechooff |
| @echo off |
| +:skipechooff |
| |
| :: Keep environment variables within this script |
| :: unless invoked with --no-local. |
| @@ -73,6 +75,9 @@ |
| if errorlevel 1 goto fail |
| .\cmd\dist\dist env -w -p >env.bat |
| if errorlevel 1 goto fail |
| +if "%GO_BUILD_VERBOSE%" neq "1" goto skipenvdebug |
| +copy /Y env.bat ..\..\..\env-bad-MSYS2.bat |
| +:skipenvdebug |
| call env.bat |
| del env.bat |
| echo. |
| @@ -82,8 +87,20 @@ |
| |
| set buildall=-a |
| if x%1==x--no-clean set buildall= |
| +if "%GO_BUILD_VERBOSE%"=="1" goto skipquietbuild |
| .\cmd\dist\dist bootstrap %buildall% -v |
| +goto skipnoisybuild |
| +:skipquietbuild |
| +.\cmd\dist\dist env |
| +set > ..\..\..\set-bad-MSYS2.txt |
| +:: set /P continue=Sould I execute (1) .\cmd\dist\dist bootstrap %buildall% -v=5 or skip it (0)? |
| +set continue=1 |
| +if "%continue%" neq "1" goto skipnoisybuild |
| +.\cmd\dist\dist bootstrap %buildall% -v=5 |
| +:skipnoisybuild |
| + |
| if errorlevel 1 goto fail |
| +echo "OK: .\cmd\dist\dist bootstrap %buildall% -v=5" |
| :: Delay move of dist tool to now, because bootstrap cleared tool directory. |
| move .\cmd\dist\dist.exe "%GOTOOLDIR%\dist.exe" |
| echo. |
| @@ -99,7 +116,7 @@ |
| setlocal |
| set GOOS=%GOHOSTOS% |
| set GOARCH=%GOHOSTARCH% |
| -"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -v std cmd |
| +"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -v -v -v std cmd |
| endlocal |
| if errorlevel 1 goto fail |
| echo. |
| @@ -108,7 +125,7 @@ |
| echo ##### Building packages and commands for %GOOS%/%GOARCH%. |
| setlocal |
| set CC=%CC_FOR_TARGET% |
| -"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -a -v std cmd |
| +"%GOTOOLDIR%\go_bootstrap" install -gcflags "%GO_GCFLAGS%" -ldflags "%GO_LDFLAGS%" -a -v -v -v std cmd |
| endlocal |
| if errorlevel 1 goto fail |
| del "%GOTOOLDIR%\go_bootstrap.exe" |
