diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-12-03 20:05:59 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-12-03 20:05:59 +0000 |
| commit | 9e5eb030d1d2a71e453e37fc5f8ba9930122a839 (patch) | |
| tree | d817856559376cf61e43a596c116bd6b03d260ab | |
| parent | f5044097636f0cf171f816f4ffb079617175f621 (diff) | |
Rename wasm target to wasm32
| -rw-r--r-- | runtime/makefile | 10 | ||||
| -rw-r--r-- | runtime/wasm32.meson (renamed from runtime/wasm.meson) | 0 | ||||
| -rw-r--r-- | src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/runtime/makefile b/runtime/makefile index 762abe82..15f7d2c0 100644 --- a/runtime/makefile +++ b/runtime/makefile @@ -1,6 +1,6 @@ .PHONY: all -all: target/amd64/libshed.a target/wasm/libshed.a +all: target/amd64/libshed.a target/wasm32/libshed.a .PHONY: target/amd64/libshed.a @@ -8,8 +8,8 @@ target/amd64/libshed.a: meson setup target/amd64 --werror cd target/amd64 && meson compile --verbose -.PHONY: target/wasm/libshed.a +.PHONY: target/wasm32/libshed.a -target/wasm/libshed.a: - meson setup target/wasm --cross-file wasm.meson --werror - cd target/wasm && meson compile --verbose +target/wasm32/libshed.a: + meson setup target/wasm32 --cross-file wasm32.meson --werror + cd target/wasm32 && meson compile --verbose diff --git a/runtime/wasm.meson b/runtime/wasm32.meson index 6adb248b..6adb248b 100644 --- a/runtime/wasm.meson +++ b/runtime/wasm32.meson diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java index 17b5c1ff..97ea0a60 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java @@ -29,7 +29,7 @@ public class WasmBackend implements Backend { @Override public String name() { - return "wasm"; + return "wasm32"; } @Override @@ -78,7 +78,7 @@ public class WasmBackend implements Backend { ldArgs.add(input.toString()); } - ldArgs.add(ShedCompilerFiles.getRoot().resolve("runtime/target/wasm/libshed.a").toString()); + ldArgs.add(ShedCompilerFiles.getRoot().resolve("runtime/target/wasm32/libshed.a").toString()); runInheritIo(ldArgs); } |