From d004d623678d8dd169e08d14c0214d7122b674c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 31 Aug 2024 23:40:30 +0100 Subject: [PATCH] re-add "package P not in std" special case when loading runtimeLinknamed Since some packages are in some Go versions but not others. We had a version of this check when we last supported two Go versions. --- shared.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shared.go b/shared.go index 43c4df3..2c7a34a 100644 --- a/shared.go +++ b/shared.go @@ -265,10 +265,13 @@ func appendListedPackages(packages []string, mainBuild bool) error { } if perr := pkg.Error; perr != nil { - if pkg.Standard && len(pkg.CompiledGoFiles) == 0 && len(pkg.IgnoredGoFiles) > 0 { + if !mainBuild && len(pkg.CompiledGoFiles) == 0 && len(pkg.IgnoredGoFiles) > 0 { // Some packages in runtimeLinknamed need a build tag to be importable, // like crypto/internal/boring/fipstls with boringcrypto, // so any pkg.Error should be ignored when the build tag isn't set. + } else if !mainBuild && strings.Contains(perr.Err, "is not in std") { + // When we support multiple Go versions at once, some packages may only + // exist in the newer version, so we fail to list them with the older. } else { if pkgErrors.Len() > 0 { pkgErrors.WriteString("\n")