diff options
| author | Jay Conrod <jayconrod@google.com> | 2020-09-15 12:59:05 -0400 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2020-09-21 01:30:48 +0000 |
| commit | b4ea67200977b99ede1885ed77e034a2fdf434f5 (patch) | |
| tree | 449b2198901620747bd963e180f9daf8d0464565 /src/cmd/go/internal/modload/init.go | |
| parent | 331614c4daa5504ddfe35a96371cc34783d14cf1 (diff) | |
| download | go-b4ea67200977b99ede1885ed77e034a2fdf434f5.tar.gz go-b4ea67200977b99ede1885ed77e034a2fdf434f5.zip | |
cmd/go: default to GO111MODULE=on
Fixes #41330
Change-Id: Ib66087ac5e1eb827694915f21c32c4d88e1b9a7e
Reviewed-on: https://go-review.googlesource.com/c/go/+/255052
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Trust: Jay Conrod <jayconrod@google.com>
Trust: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/init.go')
| -rw-r--r-- | src/cmd/go/internal/modload/init.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go index 7a62436e35..9596368f00 100644 --- a/src/cmd/go/internal/modload/init.go +++ b/src/cmd/go/internal/modload/init.go @@ -120,9 +120,9 @@ func Init() { switch env { default: base.Fatalf("go: unknown environment setting GO111MODULE=%s", env) - case "auto", "": + case "auto": mustUseModules = ForceUseModules - case "on": + case "on", "": mustUseModules = true case "off": if ForceUseModules { @@ -257,9 +257,9 @@ func WillBeEnabled() bool { // exits, so it can't call this function directly. env := cfg.Getenv("GO111MODULE") switch env { - case "on": + case "on", "": return true - case "auto", "": + case "auto": break default: return false |