summaryrefslogtreecommitdiffstats
path: root/vendor/modernc.org/ccgo
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/modernc.org/ccgo')
-rw-r--r--vendor/modernc.org/ccgo/v3/lib/Makefile1
-rw-r--r--vendor/modernc.org/ccgo/v3/lib/ccgo.go6
2 files changed, 5 insertions, 2 deletions
diff --git a/vendor/modernc.org/ccgo/v3/lib/Makefile b/vendor/modernc.org/ccgo/v3/lib/Makefile
index 552a4284..0e9b362e 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 38882b7a..a2efca3e 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