diff options
| author | Russ Cox <rsc@golang.org> | 2012-02-02 23:32:41 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2012-02-02 23:32:41 -0500 |
| commit | 795533751bf0be95b44f1479f5b238c35f181a90 (patch) | |
| tree | 3eb959020b7bdae098aca14e63c4882da26a39be /src/make.bash | |
| parent | 62fdde7a6bfb8d9c3846573e32e6e6c802e1d054 (diff) | |
| download | go-795533751bf0be95b44f1479f5b238c35f181a90.tar.gz | |
build: rename $GOROOT/bin/go-tool to $GOROOT/bin/tool.
The go- is redundant now that the directory is required
to be inside $GOROOT. Rob LGTMed the idea.
R=golang-dev, gri
CC=golang-dev
http://codereview.appspot.com/5618044
Diffstat (limited to 'src/make.bash')
| -rwxr-xr-x | src/make.bash | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/make.bash b/src/make.bash index fafd843e0..9b4377070 100755 --- a/src/make.bash +++ b/src/make.bash @@ -22,10 +22,11 @@ if ld --version 2>&1 | grep 'gold.* 2\.20' >/dev/null; then fi # Create target directories -mkdir -p "$GOROOT/bin/go-tool" +mkdir -p "$GOROOT/bin/tool" mkdir -p "$GOROOT/pkg" -# Remove old, pre-go-tool binaries. +# Remove old, pre-tool binaries. +rm -rf "$GOROOT"/bin/go-tool rm -f "$GOROOT"/bin/[568][acgl] rm -f "$GOROOT"/bin/{6cov,6nm,cgo,ebnflint,goapi,gofix,goinstall,gomake,gopack,gopprof,gotest,gotype,govet,goyacc,quietgcc} @@ -44,13 +45,13 @@ export MAKEFLAGS unset CDPATH # in case user has it set rm -f "$GOBIN"/quietgcc -rm -f "$GOROOT/bin/go-tool/quietgcc" +rm -f "$GOROOT/bin/tool/quietgcc" CC=${CC:-gcc} export CC -sed -e "s|@CC@|$CC|" < "$GOROOT"/src/quietgcc.bash > "$GOROOT"/bin/go-tool/quietgcc -chmod +x "$GOROOT"/bin/go-tool/quietgcc +sed -e "s|@CC@|$CC|" < "$GOROOT"/src/quietgcc.bash > "$GOROOT"/bin/tool/quietgcc +chmod +x "$GOROOT"/bin/tool/quietgcc -export GOMAKE="$GOROOT"/bin/go-tool/make +export GOMAKE="$GOROOT"/bin/tool/make rm -f "$GOBIN"/gomake rm -f "$GOMAKE" ( |