Merge branch 'brendo-m-macosx'

iffy · Dec 14, 2022 · aedf540 · aedf540
2 parents ba27485 + c240ae1
commit aedf540
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -63,6 +63,17 @@ From macosx-amd64
   --target windows-amd64
   --target windows-arm64
   --target windows-i386
+From macosx-arm64
+  --target linux-amd64
+  --target linux-amd64-gnu.2.27
+  --target linux-amd64-gnu.2.28
+  --target linux-amd64-gnu.2.31
+  --target linux-i386
+  --target macosx-amd64
+  --target macosx-arm64
+  --target windows-amd64
+  --target windows-arm64
+  --target windows-i386
 From windows-amd64
   --target linux-amd64
   --target linux-amd64-gnu.2.27

diff --git a/src/nimxc.nim b/src/nimxc.nim
@@ -109,16 +109,18 @@ const nimOStoZigOS = {
   "macosx": "macos",
 }.toTable()
 
+const zigVersion = "0.9.0"
+
 const zigurls = {
-  "macosx-amd64": "https://ziglang.org/download/0.9.0/zig-macos-x86_64-0.9.0.tar.xz",
-  "linux-amd64": "https://ziglang.org/download/0.9.0/zig-linux-x86_64-0.9.0.tar.xz",
-  "linux-i386": "https://ziglang.org/download/0.9.0/zig-linux-i386-0.9.0.tar.xz",
-  "windows-amd64": "https://ziglang.org/download/0.9.0/zig-windows-x86_64-0.9.0.zip",
-  "windows-i386": "https://ziglang.org/download/0.9.0/zig-windows-i386-0.9.0.zip",
-  "windows-arm64": "https://ziglang.org/download/0.9.0/zig-windows-aarch64-0.9.0.zip",
+  "macosx-amd64": fmt"https://ziglang.org/download/{zigVersion}/zig-macos-x86_64-{zigVersion}.tar.xz",
+  "macosx-arm64": fmt"https://ziglang.org/download/{zigVersion}/zig-macos-aarch64-{zigVersion}.tar.xz",
+  "linux-amd64": fmt"https://ziglang.org/download/{zigVersion}/zig-linux-x86_64-{zigVersion}.tar.xz",
+  "linux-i386": fmt"https://ziglang.org/download/{zigVersion}/zig-linux-i386-{zigVersion}.tar.xz",
+  "windows-amd64": fmt"https://ziglang.org/download/{zigVersion}/zig-windows-x86_64-{zigVersion}.zip",
+  "windows-i386": fmt"https://ziglang.org/download/{zigVersion}/zig-windows-i386-{zigVersion}.zip",
+  "windows-arm64": fmt"https://ziglang.org/download/{zigVersion}/zig-windows-aarch64-{zigVersion}.zip",
 }.toTable()
 
-
 proc mkArgs(zig_root: string, target: Target): seq[string] =
   ## Return the compiler args for the given target
   var zig_target = (

diff --git a/tests/test_everything.nim b/tests/test_everything.nim
@@ -12,6 +12,7 @@ var toskip = [
   "ssl_from_macosx-amd64_to_linux-amd64",
   "sqlite_from_windows-amd64_to_linux-amd64-gnu.2.27",
   "sqlite_from_macosx-amd64_to_linux-amd64-gnu.2.27",
+  "sqlite_from_macosx-arm64_to_linux-amd64-gnu.2.27",
   "regex_from_windows-amd64_to_linux-amd64",
   "regex_from_macosx-amd64_to_linux-amd64",
 ]