qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-27 01:11:20 -07:00
Code Releases Activity

cmd/link: use filepath.Join rather than d + "/" + f

Browse Source 
Fixes #26917

Change-Id: I676f016ed43aaa523b6d3a87b28a1d1d2ebe72c4
Reviewed-on: https://go-review.googlesource.com/c/153237
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Ian Lance Taylor 2018-12-07 12:18:22 -08:00
parent d20b6d8849
commit 9555769aa5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/link/internal/ld/ld.go
View File

@ -136,13 +136,13 @@ func findlib(ctxt *Link, lib string) (string, bool) {
// try dot, -L "libdir", and then goroot. // try dot, -L "libdir", and then goroot.
for _, dir := range ctxt.Libdir { for _, dir := range ctxt.Libdir {
if ctxt.linkShared { if ctxt.linkShared {
pname = dir + "/" + pkg + ".shlibname" pname = filepath.Join(dir, pkg+".shlibname")
if _, err := os.Stat(pname); err == nil { if _, err := os.Stat(pname); err == nil {
isshlib = true isshlib = true
break break
} }
} }
pname = dir + "/" + name pname = filepath.Join(dir, name)
if _, err := os.Stat(pname); err == nil { if _, err := os.Stat(pname); err == nil {
break break
} }