Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Upgrade zig to 0.10.0 (except for old macOS versions) #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iffy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade zig to 0.10.0 (except for old macOS versions) #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49fedac
Upgrade zig to 0.10.0 (except for old macOS versions)
iffy Dec 14, 2022
7cedd74
Workaround Zig Issue 8531 by passing '-fno-lto' to compilation
iffy Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/new-Upgrade-zig-to-20221213-224827.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade zig to 0.10.0 (except for old macOS versions)
39 changes: 30 additions & 9 deletions src/nimxc.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,33 @@ const nimOStoZigOS = {
"macosx": "macos",
}.toTable()

const zigVersion = "0.9.0"
func parseNumericVersion(x: string): seq[int] =
x.split(".").mapIt(it.parseInt)

func `<=`(a, b: seq[int]): bool =
for (x,y) in zip(a,b):
if x > y:
return false
return true

const zigVersion = block:
when defined(macosx):
let version = staticExec("sw_vers -productVersion").strip.parseNumericVersion
if version >= @[11, 0, 0]:
"0.10.0"
else:
"0.9.0"
else:
"0.10.0"

const zigurls = {
"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",
"macosx-amd64": &"https://ziglang.org/download/{zigVersion}/zig-macos-x86_64-{zigVersion}.tar.xz",
"macosx-arm64": &"https://ziglang.org/download/{zigVersion}/zig-macos-aarch64-{zigVersion}.tar.xz",
"linux-amd64": &"https://ziglang.org/download/{zigVersion}/zig-linux-x86_64-{zigVersion}.tar.xz",
"linux-i386": &"https://ziglang.org/download/{zigVersion}/zig-linux-i386-{zigVersion}.tar.xz",
"windows-amd64": &"https://ziglang.org/download/{zigVersion}/zig-windows-x86_64-{zigVersion}.zip",
"windows-i386": &"https://ziglang.org/download/{zigVersion}/zig-windows-i386-{zigVersion}.zip",
"windows-arm64": &"https://ziglang.org/download/{zigVersion}/zig-windows-aarch64-{zigVersion}.zip",
}.toTable()

proc mkArgs(zig_root: string, target: Target): seq[string] =
Expand All @@ -128,7 +145,7 @@ proc mkArgs(zig_root: string, target: Target): seq[string] =
nimArchToZigArch.getOrDefault(target.cpu, target.cpu),
target.extra,
)
@[
result = @[
"--cc:clang",
"--cpu:" & target.cpu,
"--os:" & target.os,
Expand All @@ -140,6 +157,10 @@ proc mkArgs(zig_root: string, target: Target): seq[string] =
&"--passC:-target {zig_target.zigfmt} -fno-sanitize=undefined",
&"--passL:-target {zig_target.zigfmt} -fno-sanitize=undefined",
]
# TODO: Workaround for https://github.com/ziglang/zig/issues/8531
when zigVersion == "0.10.0":
result.add "--passC:-fno-lto"
result.add "--passL:-fno-lto"

#----------------------------------------------------------------------
const targets : seq[Target] = @[
Expand Down