fix go 1.14 support with static binaryen

niaow · niaow · commit eeb9df49961a · 2021-08-30T13:57:38.000-04:00
diff --git a/builder/tools-builtin.go b/builder/tools-builtin.go
@@ -5,7 +5,7 @@ package builder
 import (
 	"errors"
 	"fmt"
-	"os"
+	"io/ioutil"
 	"sync"
 	"unsafe"
 )
@@ -62,7 +62,7 @@ func RunTool(tool string, args ...string) error {
 var wasmOptLock sync.Mutex
 
 func WasmOpt(src, dst string, cfg BinaryenConfig) error {
-	data, err := os.ReadFile(src)
+	data, err := ioutil.ReadFile(src)
 	if err != nil {
 		return fmt.Errorf("reading source file: %w", err)
 	}
@@ -72,7 +72,7 @@ func WasmOpt(src, dst string, cfg BinaryenConfig) error {
 		return fmt.Errorf("running wasm-opt: %w", err)
 	}
 
-	err = os.WriteFile(dst, data, 0666)
+	err = ioutil.WriteFile(dst, data, 0666)
 	if err != nil {
 		return fmt.Errorf("writing destination file: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ package builder`
`5`	`5`	`import (`
`6`	`6`	`"errors"`
`7`	`7`	`"fmt"`
`8`		`- "os"`
	`8`	`+ "io/ioutil"`
`9`	`9`	`"sync"`
`10`	`10`	`"unsafe"`
`11`	`11`	`)`
`@@ -62,7 +62,7 @@ func RunTool(tool string, args ...string) error {`
`62`	`62`	`var wasmOptLock sync.Mutex`
`63`	`63`
`64`	`64`	`func WasmOpt(src, dst string, cfg BinaryenConfig) error {`
`65`		`- data, err := os.ReadFile(src)`
	`65`	`+ data, err := ioutil.ReadFile(src)`
`66`	`66`	`if err != nil {`
`67`	`67`	`return fmt.Errorf("reading source file: %w", err)`
`68`	`68`	`}`
`@@ -72,7 +72,7 @@ func WasmOpt(src, dst string, cfg BinaryenConfig) error {`
`72`	`72`	`return fmt.Errorf("running wasm-opt: %w", err)`
`73`	`73`	`}`
`74`	`74`
`75`		`- err = os.WriteFile(dst, data, 0666)`
	`75`	`+ err = ioutil.WriteFile(dst, data, 0666)`
`76`	`76`	`if err != nil {`
`77`	`77`	`return fmt.Errorf("writing destination file: %w", err)`
`78`	`78`	`}`