From 8aacf067dd2f1d1c608a75d3829aa99db0ad9b4c Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Tue, 1 Nov 2022 23:07:16 +0900
Subject: [PATCH] all: use x/sys/execabs instead of os/exec

Closes #2418
---
 cmd/ebitenmobile/gobind.go               | 2 +-
 cmd/ebitenmobile/gomobile.go             | 2 +-
 cmd/ebitenmobile/main.go                 | 2 +-
 internal/png/gen.go                      | 2 +-
 internal/processtest/processtest_test.go | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/ebitenmobile/gobind.go b/cmd/ebitenmobile/gobind.go
index 9f5ccdf04..e470bbc6a 100644
--- a/cmd/ebitenmobile/gobind.go
+++ b/cmd/ebitenmobile/gobind.go
@@ -23,10 +23,10 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 
+	exec "golang.org/x/sys/execabs"
 	"golang.org/x/tools/go/packages"
 )
 
diff --git a/cmd/ebitenmobile/gomobile.go b/cmd/ebitenmobile/gomobile.go
index 3fe1a0d90..6b47767b2 100644
--- a/cmd/ebitenmobile/gomobile.go
+++ b/cmd/ebitenmobile/gomobile.go
@@ -18,13 +18,13 @@ import (
 	_ "embed"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
 
 	// Add a dependency on gomobile in order to get the version via debug.ReadBuildInfo().
 	_ "golang.org/x/mobile/geom"
+	exec "golang.org/x/sys/execabs"
 )
 
 //go:embed gobind.go
diff --git a/cmd/ebitenmobile/main.go b/cmd/ebitenmobile/main.go
index df436ab3a..563810370 100644
--- a/cmd/ebitenmobile/main.go
+++ b/cmd/ebitenmobile/main.go
@@ -25,11 +25,11 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 	"text/template"
 
+	exec "golang.org/x/sys/execabs"
 	"golang.org/x/tools/go/packages"
 )
 
diff --git a/internal/png/gen.go b/internal/png/gen.go
index b2502586a..1eb555214 100644
--- a/internal/png/gen.go
+++ b/internal/png/gen.go
@@ -24,10 +24,10 @@ import (
 	"go/parser"
 	"go/token"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 
+	exec "golang.org/x/sys/execabs"
 	"golang.org/x/tools/go/ast/astutil"
 )
 
diff --git a/internal/processtest/processtest_test.go b/internal/processtest/processtest_test.go
index 66c27cf0a..61ae2b190 100644
--- a/internal/processtest/processtest_test.go
+++ b/internal/processtest/processtest_test.go
@@ -20,10 +20,11 @@ package processtest_test
 import (
 	"bytes"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
+
+	exec "golang.org/x/sys/execabs"
 )
 
 func TestPrograms(t *testing.T) {