From 9555769aa5f706075dc5930f3dba2e3a31c110c3 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 7 Dec 2018 12:18:22 -0800 Subject: [PATCH] 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 Reviewed-by: Brad Fitzpatrick --- src/cmd/link/internal/ld/ld.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } -- 2.48.1