From 37612f9112af1b29e1eeab7f665beff358669feb Mon Sep 17 00:00:00 2001 From: Thomas Bruyelle Date: Fri, 21 Mar 2025 10:17:16 +0100 Subject: [PATCH] gogio: fix #633 wasm_exec.js location for go1.24 Signed-off-by: Thomas Bruyelle --- gogio/jsbuild.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gogio/jsbuild.go b/gogio/jsbuild.go index b99f048..2b24fcf 100644 --- a/gogio/jsbuild.go +++ b/gogio/jsbuild.go @@ -78,9 +78,14 @@ func buildJS(bi *buildInfo) error { if err != nil { return err } - wasmJS := filepath.Join(goroot, "misc", "wasm", "wasm_exec.js") + // Location of the wasm_exec.js for go>=1.24 + wasmJS := filepath.Join(goroot, "lib", "wasm", "wasm_exec.js") if _, err := os.Stat(wasmJS); err != nil { - return fmt.Errorf("failed to find $GOROOT/misc/wasm/wasm_exec.js driver: %v", err) + // Location of the wasm_exec.js for go<1.24 + wasmJS = filepath.Join(goroot, "misc", "wasm", "wasm_exec.js") + if _, err := os.Stat(wasmJS); err != nil { + return fmt.Errorf("failed to find $GOROOT/misc/wasm/wasm_exec.js driver: %v", err) + } } pkgs, err := packages.Load(&packages.Config{ Mode: packages.NeedName | packages.NeedFiles | packages.NeedImports | packages.NeedDeps,