Don't try to be clever with GoRoot; use what's in the path.

This commit is contained in:
Sudhi Herle 2023-09-10 12:28:49 -07:00
parent c95515af0e
commit a538ac8e5c

6
build
View file

@ -29,8 +29,7 @@ Static=0
Dryrun=0 Dryrun=0
Prodver="" Prodver=""
Verbose=0 Verbose=0
GoRoot=$HOME/go Go=`which go`
Go=$GoRoot/bin/go
die() { die() {
echo "$Z: $@" 1>&2 echo "$Z: $@" 1>&2
@ -83,7 +82,7 @@ Options:
-v, --verbose Build verbosely (adds "-v" to go tooling) [False] -v, --verbose Build verbosely (adds "-v" to go tooling) [False]
--vet Run "go vet" on modules named on the command line [False] --vet Run "go vet" on modules named on the command line [False]
--mod Run "go mod ..." [False] --mod Run "go mod ..." [False]
--go-root=G Use Go in GOROOT 'G' [$GoRoot] --go=G Use Go in 'G' [$Go]
-x Run in debug/trace mode [False] -x Run in debug/trace mode [False]
--print-arch Print the target architecture and exit --print-arch Print the target architecture and exit
EOF EOF
@ -217,7 +216,6 @@ done
# let every error abort # let every error abort
set -e set -e
Go=$GoRoot/bin/go
# build a tool that runs on the host - if needed. # build a tool that runs on the host - if needed.
hosttool() { hosttool() {