[dev.boringcrypto] all: merge master into dev.boringcrypto

[gostls13.git] / src / cmd / go / internal / load / pkg.go

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index c6c5fb00a8db54c288b7c80deb6f8d27e4b86ba1..f9051cce3dd0bc902f9178bc42a71c093fc68e96 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -388,6 +388,12 @@ func (p *Package) copyBuild(opts PackageOpts, pp *build.Package) {
        p.SwigFiles = pp.SwigFiles
        p.SwigCXXFiles = pp.SwigCXXFiles
        p.SysoFiles = pp.SysoFiles
+       if cfg.BuildMSan {
+               // There's no way for .syso files to be built both with and without
+               // support for memory sanitizer. Assume they are built without,
+               // and drop them.
+               p.SysoFiles = nil
+       }
        p.CgoCFLAGS = pp.CgoCFLAGS
        p.CgoCPPFLAGS = pp.CgoCPPFLAGS
        p.CgoCXXFLAGS = pp.CgoCXXFLAGS