diff options
| author | Russ Cox <rsc@golang.org> | 2010-08-25 17:54:10 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-08-25 17:54:10 -0400 |
| commit | c4a2145daa6a54ac34ad2d3ebcbcec92e02902c8 (patch) | |
| tree | e1823f37f4f4a09a0f98a6b4f052b6cc25a64d60 /src/make.bash | |
| parent | f252c5f8107d6461dbc5efb4c273fef6a8d52839 (diff) | |
| download | go-c4a2145daa6a54ac34ad2d3ebcbcec92e02902c8.tar.gz | |
build: let pkg/Makefile coordinate building of Go commands
Commands written in Go depend on Go packages, so they
cannot be built by src/cmd/make.bash. They have been
built by src/make.bash after all the packages are done, but
we want to be able to use cgo (written in Go) during the build
of package net. To make this possible, build the commands
from src/pkg/Makefile instead of src/make.bash, so that they
are included in the package dependency analysis.
R=r
CC=golang-dev
http://codereview.appspot.com/1972046
Diffstat (limited to 'src/make.bash')
| -rwxr-xr-x | src/make.bash | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/make.bash b/src/make.bash index 99155bd0f..ad5c5444b 100755 --- a/src/make.bash +++ b/src/make.bash @@ -52,7 +52,8 @@ fi ) bash "$GOROOT"/src/clean.bash -for i in lib9 libbio libmach cmd pkg libcgo cmd/cgo cmd/ebnflint cmd/godoc cmd/gofmt cmd/goinstall cmd/goyacc cmd/hgpatch +# pkg builds libcgo and the Go programs in cmd. +for i in lib9 libbio libmach cmd pkg do case "$i-$GOOS-$GOARCH" in libcgo-nacl-* | cmd/*-nacl-* | libcgo-linux-arm) |