提交 337af63d 编写于 作者: chai2010's avatar chai2010

修复 wa build 命令

上级 086bfa84
......@@ -16,7 +16,7 @@ import (
"wa-lang.org/wa/internal/app/waruntime"
"wa-lang.org/wa/internal/config"
"wa-lang.org/wabt-go/wabt-wasm"
wabt_wasm "wa-lang.org/wabt-go/wabt-wasm"
)
func getWatAbsDir(filename string) string {
......@@ -34,9 +34,9 @@ func RunWasm(cfg *config.Config, filename string, wasmArgs ...string) (stdoutStd
return
}
func RunWat2Wasm(dir string, args ...string) (stdoutStderr []byte, err error) {
stdout, strerr, err := runWat2Wasm(dir, args...)
stdoutStderr = append(stdout, strerr...)
func RunWat2Wasm(filename string) (stdout, stderr []byte, err error) {
watDir := getWatAbsDir(filename)
stdout, stderr, err = runWat2Wasm(watDir, "/"+filepath.Base(filename), "--output=-")
return
}
......
......@@ -207,8 +207,16 @@ func Main() {
os.Exit(1)
}
if strings.HasSuffix(outfile, ".wasm") {
if stdoutStderr, err := apputil.RunWat2Wasm(watFilename, "-o", outfile); err != nil {
fmt.Println(string(stdoutStderr))
stdout, stderr, err := apputil.RunWat2Wasm(watFilename)
if err != nil {
if len(stderr) != 0 {
fmt.Println(string(stderr))
}
fmt.Println(err)
os.Exit(1)
}
if err := os.WriteFile(outfile, stdout, 0666); err != nil {
fmt.Println(err)
os.Exit(1)
}
os.Remove(watFilename)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册