cmd/go/internal/imports: loadTags() should merge tags from BuildContext.ToolTags

ZekeLu · ZekeLu · commit bdcba6f6644a · 2022-08-23T19:34:05.000+08:00
diff --git a/src/cmd/go/internal/imports/tags.go b/src/cmd/go/internal/imports/tags.go
@@ -36,6 +36,9 @@ func loadTags() map[string]bool {
 	for _, tag := range cfg.BuildContext.BuildTags {
 		tags[tag] = true
 	}
+	for _, tag := range cfg.BuildContext.ToolTags {
+		tags[tag] = true
+	}
 	for _, tag := range cfg.BuildContext.ReleaseTags {
 		tags[tag] = true
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,9 @@ func loadTags() map[string]bool {`
`36`	`36`	`for _, tag := range cfg.BuildContext.BuildTags {`
`37`	`37`	`tags[tag] = true`
`38`	`38`	`}`
	`39`	`+ for _, tag := range cfg.BuildContext.ToolTags {`
	`40`	`+ tags[tag] = true`
	`41`	`+ }`
`39`	`42`	`for _, tag := range cfg.BuildContext.ReleaseTags {`
`40`	`43`	`tags[tag] = true`
`41`	`44`	`}`