diff options
author | Dave Cheney <dave@cheney.net> | 2011-02-24 15:56:53 +1100 |
---|---|---|
committer | Andrew Gerrand <adg@golang.org> | 2011-02-24 15:56:53 +1100 |
commit | a1d95deaaabf31f0ff80a8314dc8fb1d90f76d2f (patch) | |
tree | a4097467dca7bb20a02668dc12b9503f56b1f3a8 | |
parent | 162d510d7e8d67c5a144e728c5866b7703bc317c (diff) | |
download | go-a1d95deaaabf31f0ff80a8314dc8fb1d90f76d2f.tar.gz go-a1d95deaaabf31f0ff80a8314dc8fb1d90f76d2f.zip |
build: remove unused nacl conditional from make.bash
R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/4217042
-rwxr-xr-x | src/make.bash | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/src/make.bash b/src/make.bash index 43c70a87ba..0cbf3becb4 100755 --- a/src/make.bash +++ b/src/make.bash @@ -61,29 +61,24 @@ bash "$GOROOT"/src/clean.bash # pkg builds libcgo and the Go programs in cmd. for i in lib9 libbio libmach cmd pkg do - case "$i-$GOOS-$GOARCH" in - cmd/*-nacl-*) - ;; - *) - # The ( ) here are to preserve the current directory - # for the next round despite the cd $i below. - # set -e does not apply to ( ) so we must explicitly - # test the exit status. - ( - echo; echo; echo %%%% making $i %%%%; echo - cd "$GOROOT"/src/$i - case $i in - cmd) - bash make.bash - ;; - pkg) - gomake install - ;; - *) - gomake install - esac - ) || exit 1 - esac + # The ( ) here are to preserve the current directory + # for the next round despite the cd $i below. + # set -e does not apply to ( ) so we must explicitly + # test the exit status. + ( + echo; echo; echo %%%% making $i %%%%; echo + cd "$GOROOT"/src/$i + case $i in + cmd) + bash make.bash + ;; + pkg) + gomake install + ;; + *) + gomake install + esac + ) || exit 1 done # Print post-install messages. |