aboutsummaryrefslogtreecommitdiff
path: root/src/make.bash
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-08-25 17:54:10 -0400
committerRuss Cox <rsc@golang.org>2010-08-25 17:54:10 -0400
commit15f336b675c358e799abb2053c50caf852ebbe2b (patch)
tree7c82269c3d27da4fc0d307e45b11f24fe70064e5 /src/make.bash
parent5008927c5c1ad78808697967d1ee834ae653b76c (diff)
downloadgo-15f336b675c358e799abb2053c50caf852ebbe2b.tar.xz
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 https://golang.org/cl/1972046
Diffstat (limited to 'src/make.bash')
-rwxr-xr-xsrc/make.bash3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/make.bash b/src/make.bash
index 99155bd0f9..ad5c5444b4 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)