3 files changed, 6 insertions, 3 deletions
diff --git a/vendor/modernc.org/ccgo/v3/lib/Makefile b/vendor/modernc.org/ccgo/v3/lib/Makefile
index 552a42848..0e9b362e6 100644
--- a/vendor/modernc.org/ccgo/v3/lib/Makefile
+++ b/vendor/modernc.org/ccgo/v3/lib/Makefile
@@ -86,6 +86,7 @@ build_all_targets:
 	GOOS=openbsd GOARCH=amd64 go test -c -o /dev/null
 	GOOS=windows GOARCH=386 go test -c -o /dev/null
 	GOOS=windows GOARCH=amd64 go test -c -o /dev/null
+	GOOS=windows GOARCH=arm64 go test -c -o /dev/null
 
 devbench:
 	date 2>&1 | tee log-devbench
diff --git a/vendor/modernc.org/ccgo/v3/lib/ccgo.go b/vendor/modernc.org/ccgo/v3/lib/ccgo.go
index 38882b7af..a2efca3e0 100644
--- a/vendor/modernc.org/ccgo/v3/lib/ccgo.go
+++ b/vendor/modernc.org/ccgo/v3/lib/ccgo.go
@@ -1507,14 +1507,16 @@ out:
 		cmd = exec.Command(command[0], command[1:]...)
 		parser = makeXParser2
 	case "windows":
-		if command[0] != "make" {
+		if command[0] != "make" && command[0] != "make.exe" {
 			return fmt.Errorf("usupported build command: %s", command[0])
 		}
 
 		switch s := runtime.GOOS; s {
 		case "windows":
 			argv := append([]string{"-d"}, command[1:]...)
-			command[0] += ".exe"
+			if !strings.HasSuffix(command[0], ".exe") {
+				command[0] += ".exe"
+			}
 			cmd = exec.Command(command[0], argv...)
 			parser = makeDParser
 			break out
diff --git a/vendor/modernc.org/ccgo/v3/lib/go.go b/vendor/modernc.org/ccgo/v3/lib/go.go
index fc869395b..1983a0da9 100644
--- a/vendor/modernc.org/ccgo/v3/lib/go.go
+++ b/vendor/modernc.org/ccgo/v3/lib/go.go
@@ -1491,7 +1491,7 @@ func (p *project) layoutDefines() error {
 			}
 			name = p.scope.take(cc.String(name))
 			p.defines[nm] = define{name, val}
-			p.defineLines = append(p.defineLines, fmt.Sprintf("%s = %s", name, src))
+			p.defineLines = append(p.defineLines, fmt.Sprintf("%s = %s // %v:", name, src, p.pos(m)))
 		}
 	}
 	return nil