diff options
| author | Rob Pike <r@golang.org> | 2009-11-24 21:07:05 -0800 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2009-11-24 21:07:05 -0800 |
| commit | 9b729cc4ca02ed4b6f317539a0a6352822d63087 (patch) | |
| tree | 26eba2560de1e6ba277ebc1446ac8c216c154469 /src/make.bash | |
| parent | 0eaa84ed13811cdad766cf05d8398390068c5aff (diff) | |
| download | go-9b729cc4ca02ed4b6f317539a0a6352822d63087.tar.gz | |
fix weird all.bash failures by running deps.bash before make clean runs in pkg directory.
before this change, if pkg/Make.deps is missing or broken, clean.bash fails and the build dies
but not until much later.
add freebsd to error message about valid values of $GOOS
TODO: would be nice if this process exited when an error occurred. subshells make it hard
R=rsc
CC=golang-dev
http://codereview.appspot.com/160065
Diffstat (limited to 'src/make.bash')
| -rwxr-xr-x | src/make.bash | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/make.bash b/src/make.bash index 7d0c2b350..5807dbe4e 100755 --- a/src/make.bash +++ b/src/make.bash @@ -31,10 +31,10 @@ amd64 | 386 | arm) esac case "$GOOS" in -darwin | linux | nacl | freebsd) +darwin | freebsd | linux | nacl) ;; *) - echo '$GOOS is set to <'$GOOS'>, must be darwin, linux, or nacl' 1>&2 + echo '$GOOS is set to <'$GOOS'>, must be darwin, freebsd, linux, or nacl' 1>&2 exit 1 esac @@ -73,6 +73,10 @@ if [ -d /selinux -a -f /selinux/booleans/allow_execstack ] ; then fi fi +( + cd pkg; + bash deps.bash # do this here so clean.bash will work in the pkg directory +) bash clean.bash for i in lib9 libbio libmach cmd pkg libcgo cmd/cgo cmd/ebnflint cmd/godoc cmd/gofmt cmd/goyacc cmd/hgpatch @@ -93,7 +97,6 @@ do bash make.bash ;; pkg) - bash deps.bash gomake install ;; *) |