From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 7 Dec 2018 20:18:22 +0000 (-0800)
Subject: cmd/link: use filepath.Join rather than d + "/" + f
X-Git-Tag: go1.12beta1~133
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9555769aa5f706075dc5930f3dba2e3a31c110c3;p=gostls13.git

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

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>
---

diff --git a/src/cmd/link/internal/ld/ld.go b/src/cmd/link/internal/ld/ld.go
index 896e1c87d2..9e5e2f9872 100644
--- a/src/cmd/link/internal/ld/ld.go
+++ b/src/cmd/link/internal/ld/ld.go
@@ -136,13 +136,13 @@ func findlib(ctxt *Link, lib string) (string, bool) {
 			// try dot, -L "libdir", and then goroot.
 			for _, dir := range ctxt.Libdir {
 				if ctxt.linkShared {
-					pname = dir + "/" + pkg + ".shlibname"
+					pname = filepath.Join(dir, pkg+".shlibname")
 					if _, err := os.Stat(pname); err == nil {
 						isshlib = true
 						break
 					}
 				}
-				pname = dir + "/" + name
+				pname = filepath.Join(dir, name)
 				if _, err := os.Stat(pname); err == nil {
 					break
 				}