Commit d27721f58cfeff5fcd805125875e9c55b54b65bd | zig

author	Benjamin Feng <contact@fengb.me> 2019-11-20 00:56:34-06:00
committer	Benjamin Feng <benjamin.feng@glassdoor.com> 2019-11-20 12:06:21-06:00
log	d27721f58cfeff5fcd805125875e9c55b54b65bd
tree	781c2e2111294e4bb9b9f2e1601c6ff096f2639a
parent	218f9ff34e94511489d42f41831bc249464ed853

2 files changed, 16 insertions(+), 0 deletions(-)

lib/std/build.zig+8

 @@ -1064,6 +1064,9 @@ pub const LibExeObjStep = struct {
     /// Uses system QEMU installation to run cross compiled foreign architecture build artifacts.
     enable_qemu: bool = false,
+    /// Uses system Wasmtime installation to run cross compiled wasm/wasi build artifacts.
+    enable_wasmtime: bool = false,
     /// After following the steps in https://github.com/ziglang/zig/wiki/Updating-libc#glibc,
     /// this will be the directory $glibc-build-dir/install/glibcs
     /// Given the example of the aarch64 target, this is the directory
 @@ -1863,6 +1866,11 @@ pub const LibExeObjStep = struct {
                 try zig_args.append(bin_name);
                 try zig_args.append("--test-cmd-bin");
             },
+            .wasmtime => |bin_name| if (self.enable_wasmtime) {
+                try zig_args.append("--test-cmd");
+                try zig_args.append(bin_name);
+                try zig_args.append("--test-cmd-bin");
+            },
         }
         for (self.packages.toSliceConst()) |pkg| {
             zig_args.append("--pkg-begin") catch unreachable;

lib/std/target.zig+8

 @@ -611,6 +611,7 @@ pub const Target = union(enum) {
         native,
         qemu: []const u8,
         wine: []const u8,
+        wasmtime: []const u8,
         unavailable,
     };
 @@ -649,6 +650,13 @@ pub const Target = union(enum) {
             }
         }
+        if (self.isWasm()) {
+            switch (self.getArchPtrBitWidth()) {
+                32 => return Executor{ .wasmtime = "wasmtime" },
+                else => return .unavailable,
+            }
+        }
         return .unavailable;
     }
 };