[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 6a6f77e3673d7a074c5ebfed20c79e0bdc84235e..b7ba884da642476d08d79f9ca05efe65263e26e9 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -279,6 +279,12 @@ func (p *Package) copyBuild(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