mirror of
https://github.com/golang/go
synced 2024-11-22 05:44:41 -07:00
build: reject make.bash on Windows
Also, echo cmd/dist during bootstrap build Makes that phase look like all the others. Fixes #2908. R=golang-dev, alex.brainman, bradfitz CC=golang-dev https://golang.org/cl/5655065
This commit is contained in:
parent
b1d9ae9406
commit
b5d81e5ed5
@ -9,6 +9,16 @@ if [ ! -f run.bash ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Test for Windows.
|
||||
case "$(uname)" in
|
||||
*MINGW* | *WIN32* | *CYGWIN*)
|
||||
echo 'ERROR: Do not use make.bash to build on Windows.'
|
||||
echo 'Use make.bat instead.'
|
||||
echo
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Test for bad ld.
|
||||
if ld --version 2>&1 | grep 'gold.* 2\.20' >/dev/null; then
|
||||
echo 'ERROR: Your system has gold 2.20 installed.'
|
||||
@ -46,6 +56,7 @@ done
|
||||
# Finally! Run the build.
|
||||
|
||||
echo '# Building C bootstrap tool.'
|
||||
echo cmd/dist
|
||||
mkdir -p ../bin/tool
|
||||
export GOROOT="$(cd .. && pwd)"
|
||||
GOROOT_FINAL="${GOROOT_FINAL:-$GOROOT}"
|
||||
|
@ -1,7 +1,7 @@
|
||||
:: Copyright 2012 The Go Authors. All rights reserved.
|
||||
:: Use of this source code is governed by a BSD-style
|
||||
:: license that can be found in the LICENSE file.
|
||||
::@echo off
|
||||
@echo off
|
||||
|
||||
set GOBUILDFAIL=0
|
||||
|
||||
@ -22,6 +22,7 @@ if "x%GOROOT_FINAL%"=="x" set GOROOT_FINAL=%GOROOT%
|
||||
set DEFGOROOT=-DGOROOT_FINAL="\"%GOROOT_FINAL:\=\\%\""
|
||||
|
||||
echo # Building C bootstrap tool.
|
||||
echo cmd/dist
|
||||
if not exist ..\bin\tool mkdir ..\bin\tool
|
||||
:: Windows has no glob expansion, so spell out cmd/dist/*.c.
|
||||
gcc -O2 -Wall -Werror -o ../bin/tool/dist.exe -Icmd/dist %DEFGOROOT% cmd/dist/buf.c cmd/dist/build.c cmd/dist/buildgc.c cmd/dist/buildruntime.c cmd/dist/goc2c.c cmd/dist/main.c cmd/dist/windows.c
|
||||
|
Loading…
Reference in New Issue
Block a user