From: qmuntal <quimmuntal@gmail.com>
Date: Tue, 9 May 2023 11:02:26 +0000 (+0200)
Subject: cmd/go: fix cgo prefix mapping for non-vendored modules
X-Git-Tag: go1.21rc1~624
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fffddce55c8acdf8a834f064f7e8fab9880ecf08;p=gostls13.git

cmd/go: fix cgo prefix mapping for non-vendored modules

Regression introduced in CL 478455.

Change-Id: I8083a0accb047188dde1a3d408df2aafaf4a5356
Reviewed-on: https://go-review.googlesource.com/c/go/+/493835
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Quim Muntal <quimmuntal@gmail.com>
---

diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
index 05734c5e98..66c1bfc41a 100644
--- a/src/cmd/go/internal/work/exec.go
+++ b/src/cmd/go/internal/work/exec.go
@@ -2612,7 +2612,7 @@ func (b *Builder) ccompile(a *Action, p *load.Package, outfile string, flags []s
 				from = m.Dir
 				toPath = m.Path
 				if m.Version != "" {
-					m.Path += "@" + m.Version
+					toPath += "@" + m.Version
 				}
 			}
 			// -fdebug-prefix-map (or -ffile-prefix-map) requires an absolute "to"