From be26aa70d432572599d185492f5e2b095d75cc4d Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Wed, 10 Aug 2022 22:52:58 +0700 Subject: [PATCH] cmd/go: make cfg.BuildContext.ToolTags same order with build.Default.ToolTags So it's consistent when running "go list -f '{{context.ToolTags}}'" and printing the content of "build.Default.ToolTags". Updates #45454 Change-Id: I7a3cbf3cdf9a6ce2b8c89e9bcf5fc5e9086d48e8 Reviewed-on: https://go-review.googlesource.com/c/go/+/422615 Reviewed-by: Bryan Mills Reviewed-by: Ian Lance Taylor TryBot-Result: Gopher Robot Run-TryBot: Cuong Manh Le --- src/cmd/go/internal/cfg/cfg.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go index 7fb75db5f7..2a1475ef2e 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go @@ -237,9 +237,12 @@ func init() { CleanGOEXPERIMENT = Experiment.String() // Add build tags based on the experiments in effect. - for _, exp := range Experiment.Enabled() { - BuildContext.ToolTags = append(BuildContext.ToolTags, "goexperiment."+exp) + exps := Experiment.Enabled() + expTags := make([]string, 0, len(exps)+len(BuildContext.ToolTags)) + for _, exp := range exps { + expTags = append(expTags, "goexperiment."+exp) } + BuildContext.ToolTags = append(expTags, BuildContext.ToolTags...) } // An EnvVar is an environment variable Name=Value. -- 2.50.0