From 83d3630ca72d3f4d94da1b7a5e8d53796af2b9c0 Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Tue, 1 Aug 2023 13:12:16 +0200
Subject: [PATCH] Makefile: Honor ZIG variable + fix static build for x86

---
 Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index d5935c6..7a77bfd 100644
--- a/Makefile
+++ b/Makefile
@@ -70,15 +70,15 @@ static-%.tar.gz:
 		--without-gpm --without-sysmouse --enable-widec --with-default-terminfo-dir=/usr/share/terminfo\
 		--with-terminfo-dirs=/usr/share/terminfo:/lib/terminfo:/usr/local/share/terminfo\
 		--with-fallbacks="screen linux vt100 xterm xterm-256color" --host=$*\
-		CC="zig cc --target=$*"\
-		LD="zig cc --target=$*"\
-		AR="zig ar" RANLIB="zig ranlib"\
+		CC="${ZIG} cc --target=$*"\
+		LD="${ZIG} cc --target=$*"\
+		AR="${ZIG} ar" RANLIB="${ZIG} ranlib"\
 		CPPFLAGS=-D_GNU_SOURCE && make && make install.libs
 	@# zig-build - cleaner approach but doesn't work, results in a dynamically linked binary.
 	@#cd static-$* && PKG_CONFIG_LIBDIR="`pwd`/inst/pkg" zig build -Dtarget=$*
 	@#	--build-file ../build.zig --search-prefix inst/ --cache-dir zig -Drelease-fast=true
 	@# Alternative approach, bypassing zig-build
-	cd static-$* && zig build-exe -target $*\
+	cd static-$* && ${ZIG} build-exe -target $*\
 		-Iinst/include -Iinst/include/ncursesw -lc inst/lib/libncursesw.a\
 		--cache-dir zig-cache -static -fstrip -O ReleaseFast ../src/main.zig ../src/ncurses_refs.c
 	cd static-$* && mv main ncdu && tar -czf ../static-$*.tar.gz ncdu
@@ -87,8 +87,8 @@ static-%.tar.gz:
 static-linux-x86_64: static-x86_64-linux-musl.tar.gz
 	mv $< ncdu-${NCDU_VERSION}-linux-x86_64.tar.gz
 
-static-linux-i386: static-i386-linux-musl.tar.gz
-	mv $< ncdu-${NCDU_VERSION}-linux-i386.tar.gz
+static-linux-x86: static-x86-linux-musl.tar.gz
+	mv $< ncdu-${NCDU_VERSION}-linux-x86.tar.gz
 
 static-linux-aarch64: static-aarch64-linux-musl.tar.gz
 	mv $< ncdu-${NCDU_VERSION}-linux-aarch64.tar.gz
@@ -98,6 +98,6 @@ static-linux-arm: static-arm-linux-musleabi.tar.gz
 
 static:\
 	static-linux-x86_64 \
-	static-linux-i386 \
+	static-linux-x86 \
 	static-linux-aarch64 \
 	static-linux-arm