From 5dc7525b3e04dc7384e11b986ed13ac130afa748 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 26 Jul 2016 04:13:15 +0900 Subject: [PATCH] syscall: mksyscall_windows.go: put path separator in suffix for matching GOROOT fixes #16493 Change-Id: I86bec2f9bd7965449c43e94733791f7cb18c5c4c Reviewed-on: https://go-review.googlesource.com/25165 Reviewed-by: Alex Brainman --- src/syscall/mksyscall_windows.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/syscall/mksyscall_windows.go b/src/syscall/mksyscall_windows.go index 1e0d9401e7..4f9c5d2ff9 100644 --- a/src/syscall/mksyscall_windows.go +++ b/src/syscall/mksyscall_windows.go @@ -708,6 +708,10 @@ func (src *Source) IsStdRepo() (bool, error) { abspath = strings.ToLower(abspath) goroot = strings.ToLower(goroot) } + sep := string(os.PathSeparator) + if !strings.HasSuffix(goroot, sep) { + goroot += sep + } return strings.HasPrefix(abspath, goroot), nil } -- 2.48.1