1
0
mirror of https://github.com/golang/go synced 2024-11-24 22:57:57 -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:
Russ Cox 2010-01-28 18:18:40 -08:00
parent 16ddb6c538
commit 05f26366e5
2 changed files with 8 additions and 8 deletions

View File

@ -311,7 +311,7 @@ To update an existing tree to the latest release, you can run:
$ cd $GOROOT/src $ cd $GOROOT/src
$ hg pull $ hg pull
$ hg update release $ hg update release
$ make all $ ./all.bash
</pre> </pre>
<h2>Community resources</h2> <h2>Community resources</h2>

View File

@ -42,10 +42,10 @@ xarm)
esac esac
# Allow overrides # Allow overrides
GC=${_GC:-$GC} GC="$GOBIN/${_GC:-$GC} -I _test"
GL=${GL:-$LD} GL="$GOBIN/${GL:-$LD} -L _test"
GC="$GC -I _test" CC="$GOBIN/$CC"
GL="$GL -L _test" LD="$GOBIN/$LD"
export GC GL O AS CC LD export GC GL O AS CC LD
gofiles="" gofiles=""
@ -99,7 +99,7 @@ set -e
"$GOBIN"/gomake testpackage-clean "$GOBIN"/gomake testpackage-clean
"$GOBIN"/gomake testpackage "GOTESTFILES=$gofiles" "$GOBIN"/gomake testpackage "GOTESTFILES=$gofiles"
if $havex; then if $havex; then
"$GOBIN"/$GC -o $xofile $xgofiles $GC -o $xofile $xgofiles
fi fi
# They all compile; now generate the code to call them. # They all compile; now generate the code to call them.
@ -182,6 +182,6 @@ importpath=$("$GOBIN"/gomake -s importpath)
echo '}' echo '}'
}>_testmain.go }>_testmain.go
"$GOBIN"/$GC _testmain.go $GC _testmain.go
"$GOBIN"/$GL _testmain.$O $GL _testmain.$O
$E ./$O.out "$@" $E ./$O.out "$@"