git: aab9e2ca61bb - main - Uses/zig.mk: Make it possible to specify Zig compiler's version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Dec 2025 15:25:59 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aab9e2ca61bb3ff9df8273820aca613ad0eea627
commit aab9e2ca61bb3ff9df8273820aca613ad0eea627
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-12-28 15:20:48 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-12-28 15:25:52 +0000
Uses/zig.mk: Make it possible to specify Zig compiler's version
---
Mk/Uses/zig.mk | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/Mk/Uses/zig.mk b/Mk/Uses/zig.mk
index 5708ff05a3da..89df64ffae71 100644
--- a/Mk/Uses/zig.mk
+++ b/Mk/Uses/zig.mk
@@ -2,6 +2,9 @@
#
# Feature: zig
# Usage: USES=zig
+# Valid ARGS: (none), XYZ
+#
+# XYZ Specify alternative Zig compiler version
# Variables, which can be set by the port:
#
@@ -18,17 +21,23 @@
.if !defined(_INCLUDE_USES_ZIG_MK)
_INCLUDE_USES_ZIG_MK= yes
-. if !empty(zig_ARGS)
-IGNORE= USES=zig does not accept arguments
-. endif
+# Check arguments sanity
+. if !empty(zig_ARGS:N[0-9][0-9][0-9])
+IGNORE= USES=zig has invalid arguments: ${zig_ARGS:N[0-9][0-9][0-9]}
+. endif
.sinclude "${MASTERDIR}/Makefile.zig"
ZIG_CMD?= zig
-ZIG_PORT?= lang/zig
+ZIG_PORT?= lang/zig${zig_ARGS}
ZIG_DEPSDIR= ${WRKDIR}/zig-packages
ZIG_TMPDEPSDIR= ${WRKDIR}/zig-packages-tmp
+# Check alternative Zig version if requested
+. if ${zig_ARGS} && !exists(${PORTSDIR}/${ZIG_PORT})
+IGNORE?= USES=zig has invalid version number: ${zig_ARGS}
+. endif
+
ZIG_CPUTYPE_DEFAULT= ${ARCH:S/amd64/x86_64/}
ZIG_CPUTYPE?= ${CPUTYPE:U${ZIG_CPUTYPE_DEFAULT}}