aboutsummaryrefslogtreecommitdiff
path: root/src/run.bash
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2019-03-01 10:12:30 -0500
committerBryan C. Mills <bcmills@google.com>2019-03-11 20:28:54 +0000
commitc5cf6624076a644906aa7ec5c91c4e01ccd375d3 (patch)
tree9953a8fe6691afac06d4087f6badebf52fbc8fd9 /src/run.bash
parent0fc89a72edc2c73651f7f6841b1146af723f517f (diff)
downloadgo-c5cf6624076a644906aa7ec5c91c4e01ccd375d3.tar.gz
go-c5cf6624076a644906aa7ec5c91c4e01ccd375d3.zip
all: move internal/x to vendor/golang.org/x and revendor using 'go mod vendor'
This also updates the vendored-in versions of several packages: 'go mod vendor' selects a consistent version of each module, but we had previously vendored an ad-hoc selection of packages. Notably, x/crypto/hkdf was previously vendored in at a much newer commit than the rest of x/crypto. Bringing the rest of x/crypto up to that commit introduced an import of golang.org/x/sys/cpu, which broke the js/wasm build, requiring an upgrade of x/sys to pick up CL 165749. Updates #30228 Updates #30241 Updates #25822 Change-Id: I5b3dbc232b7e6a048a158cbd8d36137af1efb711 Reviewed-on: https://go-review.googlesource.com/c/go/+/164623 Reviewed-by: Filippo Valsorda <filippo@golang.org>
Diffstat (limited to 'src/run.bash')
-rwxr-xr-xsrc/run.bash5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/run.bash b/src/run.bash
index 1c6c424434..1acd0194b6 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -15,11 +15,10 @@ export GOROOT # the api test requires GOROOT to be set.
# to point to an actual directory, it just needs to pass the semantic
# checks performed by Go. Use $GOROOT to define $GOPATH so that we
# don't blunder into a user-defined symbolic link.
-GOPATH=$GOROOT/nonexistentpath
-export GOPATH
+export GOPATH=/dev/null
unset CDPATH # in case user has it set
-unset GOBIN # Issue 14340
+export GOBIN=$GOROOT/bin # Issue 14340
unset GOFLAGS
unset GO111MODULE