mirror of
https://github.com/golang/go
synced 2024-11-24 21:10:04 -07:00
two minor build fixes
Fixes #572. Fixes #570. R=r CC=golang-dev https://golang.org/cl/194134
This commit is contained in:
parent
16ddb6c538
commit
05f26366e5
@ -311,7 +311,7 @@ To update an existing tree to the latest release, you can run:
|
||||
$ cd $GOROOT/src
|
||||
$ hg pull
|
||||
$ hg update release
|
||||
$ make all
|
||||
$ ./all.bash
|
||||
</pre>
|
||||
|
||||
<h2>Community resources</h2>
|
||||
|
@ -42,10 +42,10 @@ xarm)
|
||||
esac
|
||||
|
||||
# Allow overrides
|
||||
GC=${_GC:-$GC}
|
||||
GL=${GL:-$LD}
|
||||
GC="$GC -I _test"
|
||||
GL="$GL -L _test"
|
||||
GC="$GOBIN/${_GC:-$GC} -I _test"
|
||||
GL="$GOBIN/${GL:-$LD} -L _test"
|
||||
CC="$GOBIN/$CC"
|
||||
LD="$GOBIN/$LD"
|
||||
export GC GL O AS CC LD
|
||||
|
||||
gofiles=""
|
||||
@ -99,7 +99,7 @@ set -e
|
||||
"$GOBIN"/gomake testpackage-clean
|
||||
"$GOBIN"/gomake testpackage "GOTESTFILES=$gofiles"
|
||||
if $havex; then
|
||||
"$GOBIN"/$GC -o $xofile $xgofiles
|
||||
$GC -o $xofile $xgofiles
|
||||
fi
|
||||
|
||||
# They all compile; now generate the code to call them.
|
||||
@ -182,6 +182,6 @@ importpath=$("$GOBIN"/gomake -s importpath)
|
||||
echo '}'
|
||||
}>_testmain.go
|
||||
|
||||
"$GOBIN"/$GC _testmain.go
|
||||
"$GOBIN"/$GL _testmain.$O
|
||||
$GC _testmain.go
|
||||
$GL _testmain.$O
|
||||
$E ./$O.out "$@"
|
||||
|
Loading…
Reference in New Issue
Block a user