examples/zig: update for latest Zig

0.12.0-dev.1533+b2ed2c4d4 was used.
au-ts · Nov 13, 2023 · 3eeff51 · 3eeff51
1 parent f765308
commit 3eeff51
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/examples/zig/README.md b/examples/zig/README.md
@@ -13,8 +13,11 @@ the Zig C compiler. Building the example is done via the Zig build system.
 
 ## Building the example
 
-You will first need Zig version 0.11.x (e.g 0.11.0 or 0.11.1) which can be
-downloaded from [here](https://ziglang.org/download/).
+At the moment, Zig still under heavy development and hence this example depends
+on the 'master' version of Zig for now. This example has been built using
+`0.12.0-dev.1533+b2ed2c4d4`, so anything equal to or above that version should work.
+
+You can download Zig [here](https://ziglang.org/download/).
 
 ```sh
 zig build -Dsdk=/path/to/sdk

diff --git a/examples/zig/build.zig b/examples/zig/build.zig
@@ -67,26 +67,29 @@ pub fn build(b: *std.Build) void {
     const libvmm_src = libvmm_path ++ "/src/";
     // Right now we only support AArch64 so this is a safe assumption.
     const libvmm_src_arch = libvmm_src ++ "arch/aarch64/";
-    libvmm.addCSourceFiles(&.{
-        libvmm_src ++ "guest.c",
-        libvmm_src ++ "util/util.c",
-        libvmm_src ++ "util/printf.c",
-        libvmm_src_arch ++ "vgic/vgic.c",
-        libvmm_src_arch ++ "vgic/vgic_v2.c",
-        libvmm_src_arch ++ "fault.c",
-        libvmm_src_arch ++ "psci.c",
-        libvmm_src_arch ++ "smc.c",
-        libvmm_src_arch ++ "virq.c",
-        libvmm_src_arch ++ "linux.c",
-        libvmm_src_arch ++ "tcb.c",
-        libvmm_src_arch ++ "vcpu.c",
-    }, &.{
-        "-Wall",
-        "-Werror",
-        "-Wno-unused-function",
-        "-mstrict-align",
-        "-DBOARD_qemu_arm_virt", // @ivanv: should not be necessary
-        // "-fno-sanitize=undefined",
+    libvmm.addCSourceFiles(.{
+        .files = &.{
+            libvmm_src ++ "guest.c",
+            libvmm_src ++ "util/util.c",
+            libvmm_src ++ "util/printf.c",
+            libvmm_src_arch ++ "vgic/vgic.c",
+            libvmm_src_arch ++ "vgic/vgic_v2.c",
+            libvmm_src_arch ++ "fault.c",
+            libvmm_src_arch ++ "psci.c",
+            libvmm_src_arch ++ "smc.c",
+            libvmm_src_arch ++ "virq.c",
+            libvmm_src_arch ++ "linux.c",
+            libvmm_src_arch ++ "tcb.c",
+            libvmm_src_arch ++ "vcpu.c",
+        },
+        .flags = &.{
+            "-Wall",
+            "-Werror",
+            "-Wno-unused-function",
+            "-mstrict-align",
+            "-DBOARD_qemu_arm_virt", // @ivanv: should not be necessary
+            // "-fno-sanitize=undefined",
+        }
     });
 
     libvmm.addIncludePath(.{ .path = libvmm_src });

diff --git a/shell.nix b/shell.nix
@@ -1,12 +1,13 @@
 let
     rust_overlay = import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
+    zig = import (builtins.fetchTarball "https://github.com/mitchellh/zig-overlay/archive/master.tar.gz") {};
     pkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
     rust = pkgs.rust-bin.fromRustupToolchainFile ./examples/rust/rust-toolchain.toml;
     llvm = pkgs.llvmPackages_11;
 in
   pkgs.mkShell {
     buildInputs = with pkgs.buildPackages; [
-        zig_0_11
+        zig.master
         rust
         qemu
         gnumake