From 318c625247c874595087742dda0b4913ac92a8ba Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Sat, 28 Feb 2026 22:23:13 +0300
Subject: [PATCH] update builder-linux

---
 docs/compile/builder-linux/build_deps.sh    |  7 +++++--
 docs/compile/builder-linux/build_zapret1.sh |  4 ++--
 docs/compile/builder-linux/common.inc       | 10 +++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/docs/compile/builder-linux/build_deps.sh b/docs/compile/builder-linux/build_deps.sh
index 6f9bb8a..8cfd273 100755
--- a/docs/compile/builder-linux/build_deps.sh
+++ b/docs/compile/builder-linux/build_deps.sh
@@ -61,10 +61,12 @@ build_lua()
 }
 build_luajit()
 {
+	local CFL="$CFLAGS"
 (
 	cd luajit2-*
+	CFLAGS="-Os"
 	make clean
-	make BUILDMODE=static CFLAGS="-O2" XCFLAGS="-DLUAJIT_DISABLE_FFI $CFLAGS_PIC" HOST_CC="$HOST_CC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFLAGS" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS"
+	make BUILDMODE=static XCFLAGS="-DLUAJIT_DISABLE_FFI $CFLAGS_PIC" HOST_CC="$HOST_CC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFL" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS"
 	make install PREFIX= DESTDIR="$STAGING_DIR"
 )
 }
@@ -91,8 +93,9 @@ ask_target
 
 CFLAGS_BASE="$CFLAGS"
 for t in $TGT; do
-        CFLAGS="$CFLAGS_BASE $CFLAGS_PIC"
+        CFLAGS="$CFLAGS_BASE"
 	buildenv $t
+	CFLAGS="$CFLAGS $CFLAGS_PIC"
 	pushd "$DEPS"
 	install_h_files
 	build_netlink
diff --git a/docs/compile/builder-linux/build_zapret1.sh b/docs/compile/builder-linux/build_zapret1.sh
index eb95137..85efcfd 100755
--- a/docs/compile/builder-linux/build_zapret1.sh
+++ b/docs/compile/builder-linux/build_zapret1.sh
@@ -38,7 +38,7 @@ ask_target
 
 CFLAGS_BASE="$CFLAGS"
 for t in $TGT; do
-        CFLAGS="$CFLAGS_BASE $MINSIZE $CFLAGS_PIC"
+        CFLAGS="$CFLAGS_BASE $MINSIZE"
 	buildenv $t
 
 	translate_target $t || {
@@ -50,7 +50,7 @@ for t in $TGT; do
 
 	make clean
 	OPTIMIZE=$OPTIMIZE \
-	CFLAGS="-static-libgcc -I$STAGING_DIR/include $CFLAGS" \
+	CFLAGS="-static-libgcc -I$STAGING_DIR/include $CFLAGS $CFLAGS_PIC" \
 	LDFLAGS="-L$STAGING_DIR/lib $LDMINSIZE $LDFLAGS_PIE $LDFLAGS" \
 	make
 
diff --git a/docs/compile/builder-linux/common.inc b/docs/compile/builder-linux/common.inc
index 198c610..128400f 100644
--- a/docs/compile/builder-linux/common.inc
+++ b/docs/compile/builder-linux/common.inc
@@ -23,7 +23,7 @@ nproc=$(nproc)
 
 TARGETS="\
 aarch64-unknown-linux-musl \
-arm-unknown-linux-musleabi \
+armv7-unknown-linux-musleabi \
 i586-unknown-linux-musl \
 x86_64-unknown-linux-musl \
 mips-unknown-linux-muslsf \
@@ -38,7 +38,7 @@ target_has_luajit()
 {
 	case "$1" in
 		aarch64-unknown-linux-musl| \
-		arm-unknown-linux-musleabi| \
+		armv7-unknown-linux-musleabi| \
 		x86_64-unknown-linux-musl| \
 		mips-unknown-linux-muslsf| \
 		mips64-unknown-linux-musl| \
@@ -100,8 +100,8 @@ buildenv()
 	# not all archs support -static-pie. if does not support - it produces dynamic executable
 	# "-static -static-pie" causes segfaults
 	case $1 in
-		arm-*)
-			CPU="-mcpu=cortex-a7 -mthumb -msoft-float $CFLAGS"
+		armv7-*)
+			CPU="-mcpu=cortex-a7 -mthumb -msoft-float"
 			CFLAGS="$CPU $CFLAGS"
 			;;
 		mips*)
@@ -273,7 +273,7 @@ translate_target()
 		aarch64-unknown-linux-musl)
 			ZBINTARGET=linux-arm64
 			;;
-		arm-unknown-linux-musleabi)
+		armv7-unknown-linux-musleabi)
 			ZBINTARGET=linux-arm
 			;;
 		x86_64-unknown-linux-musl)