diff --git a/src/cmd/go/env.go b/src/cmd/go/env.go index 600accac03f..24f612756b6 100644 --- a/src/cmd/go/env.go +++ b/src/cmd/go/env.go @@ -33,6 +33,11 @@ func mkEnv() []envVar { var b builder b.init() + vendorExpValue := "0" + if go15VendorExperiment { + vendorExpValue = "1" + } + env := []envVar{ {"GOARCH", goarch}, {"GOBIN", gobin}, @@ -44,7 +49,7 @@ func mkEnv() []envVar { {"GORACE", os.Getenv("GORACE")}, {"GOROOT", goroot}, {"GOTOOLDIR", toolDir}, - {"GO15VENDOREXPERIMENT", os.Getenv("GO15VENDOREXPERIMENT")}, + {"GO15VENDOREXPERIMENT", vendorExpValue}, // disable escape codes in clang errors {"TERM", "dumb"},