From 9e5eb030d1d2a71e453e37fc5f8ba9930122a839 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 3 Dec 2023 20:05:59 +0000
Subject: Rename wasm target to wasm32

---
 runtime/makefile                                               | 10 +++++-----
 runtime/wasm.meson                                             |  9 ---------
 runtime/wasm32.meson                                           |  9 +++++++++
 .../java/org/shedlang/compiler/backends/wasm/WasmBackend.java  |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 runtime/wasm.meson
 create mode 100644 runtime/wasm32.meson

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/wasm.meson
deleted file mode 100644
index 6adb248b..00000000
--- a/runtime/wasm.meson
+++ /dev/null
@@ -1,9 +0,0 @@
-[binaries]
-c = 'clang-16'
-ld = 'wasm-ld'
-ar = 'llvm-ar-16'
-
-[properties]
-c_args = [ '--target=wasm32', '-D__WASM__' ]
-c_link_args = [ '--target=wasm32' ]
-
diff --git a/runtime/wasm32.meson b/runtime/wasm32.meson
new file mode 100644
index 00000000..6adb248b
--- /dev/null
+++ b/runtime/wasm32.meson
@@ -0,0 +1,9 @@
+[binaries]
+c = 'clang-16'
+ld = 'wasm-ld'
+ar = 'llvm-ar-16'
+
+[properties]
+c_args = [ '--target=wasm32', '-D__WASM__' ]
+c_link_args = [ '--target=wasm32' ]
+
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);
     }
-- 
cgit v1.2.3