From c5cf6624076a644906aa7ec5c91c4e01ccd375d3 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Fri, 1 Mar 2019 10:12:30 -0500 Subject: 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 --- src/run.bash | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/run.bash') 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 -- cgit v1.3