diff options
author | Russ Cox <rsc@golang.org> | 2012-02-12 23:14:37 -0500 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2012-02-12 23:14:37 -0500 |
commit | c2de3b4738c091f307cc1a812642a1d4f3558279 (patch) | |
tree | 2a56bc9b71a9b153dcc2e1fe625d1c89df80fcc6 /src | |
parent | 49e92776c048c64bc42ed47d6397fe96edd13f09 (diff) | |
download | go-c2de3b4738c091f307cc1a812642a1d4f3558279.tar.gz |
build: reject make.bash on Windows
Also, echo cmd/dist during bootstrap build
Makes that phase look like all the others.
Fixes issue 2908.
R=golang-dev, alex.brainman, bradfitz
CC=golang-dev
http://codereview.appspot.com/5655065
Diffstat (limited to 'src')
-rwxr-xr-x | src/make.bash | 11 | ||||
-rw-r--r-- | src/make.bat | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/make.bash b/src/make.bash index 55a292eba..81ceeb729 100755 --- a/src/make.bash +++ b/src/make.bash @@ -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}" diff --git a/src/make.bat b/src/make.bat index 3a456513f..010e418c0 100644 --- a/src/make.bat +++ b/src/make.bat @@ -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 |