mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/go: fix data race on cgoLibGccFile 

Fixes #4426.

R=dvyukov
CC=golang-dev
https://golang.org/cl/6851099
This commit is contained in:
Shenghou Ma 2012-11-23 19:58:46 +08:00
parent f142deee95
commit 7171f533d0
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cmd/go/build.go
View File

@ -1478,7 +1478,7 @@ func gccgoCleanPkgpath(p *Package) string {
func (b *builder) libgcc(p *Package) (string, error) { func (b *builder) libgcc(p *Package) (string, error) {
f, err := b.runOut(p.Dir, p.ImportPath, b.gccCmd(p.Dir), "-print-libgcc-file-name") f, err := b.runOut(p.Dir, p.ImportPath, b.gccCmd(p.Dir), "-print-libgcc-file-name")
if err != nil { if err != nil {
return "", nil return "", fmt.Errorf("gcc -print-libgcc-file-name: %v (%s)", err, f)
} }
return strings.Trim(string(f), "\r\n"), nil return strings.Trim(string(f), "\r\n"), nil
} }
@ -1542,7 +1542,10 @@ func envList(key string) []string {
var cgoRe = regexp.MustCompile(`[/\\:]`) var cgoRe = regexp.MustCompile(`[/\\:]`)
var cgoLibGccFile string var (
cgoLibGccFile string
cgoLibGccFileOnce sync.Once
)
func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string) (outGo, outObj []string, err error) { func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string) (outGo, outObj []string, err error) {
if goos != toolGOOS { if goos != toolGOOS {
@ -1633,13 +1636,17 @@ func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string) (outGo,
bareLDFLAGS = append(bareLDFLAGS, f) bareLDFLAGS = append(bareLDFLAGS, f)
} }
} }
if cgoLibGccFile == "" {
var err error cgoLibGccFileOnce.Do(func() {
cgoLibGccFile, err = b.libgcc(p) cgoLibGccFile, err = b.libgcc(p)
if err != nil { })
return nil, nil, err if cgoLibGccFile == "" {
if err == nil {
err = errors.New("failed to get libgcc filename")
} }
return nil, nil, err
} }
var staticLibs []string var staticLibs []string
if goos == "windows" { if goos == "windows" {
// libmingw32 and libmingwex might also use libgcc, so libgcc must come last // libmingw32 and libmingwex might also use libgcc, so libgcc must come last