diff --git a/docs/compile/builder-linux/build_zapret2.sh b/docs/compile/builder-linux/build_zapret2.sh index 71e9868..528c4f2 100755 --- a/docs/compile/builder-linux/build_zapret2.sh +++ b/docs/compile/builder-linux/build_zapret2.sh @@ -52,11 +52,11 @@ for t in $TGT; do target_has_luajit $t && { LUA_JIT=1 LCFLAGS="-I${STAGING_DIR}/include/luajit-${LUAJIT_VER}" - LLIB="-L${STAGING_DIR}/lib -lluajit-${LUAJIT_LUAVER}" + LLIB="-L${STAGING_DIR}/lib -lluajit-${LUAJIT_LUA_VER}" } make clean - LUA_JIT=$LUA_JIT LUA_VER=$LUA_VER LUAJIT_LUA_VER=$LUAJIT_LUAVER \ + LUA_JIT=$LUA_JIT LUA_VER=$LUA_VER LUAJIT_LUA_VER=$LUAJIT_LUA_VER \ OPTIMIZE=$OPTIMIZE \ MINSIZE=$MINSIZE \ CFLAGS="-static-libgcc -static -I$STAGING_DIR/include $CFLAGS" \ diff --git a/docs/compile/builder-linux/common.inc b/docs/compile/builder-linux/common.inc index 776d363..527ba26 100644 --- a/docs/compile/builder-linux/common.inc +++ b/docs/compile/builder-linux/common.inc @@ -4,17 +4,17 @@ EXEDIR="$(cd "$EXEDIR"; pwd)" TOOLCHAINS="$EXEDIR/toolchain" DEPS="$EXEDIR/deps" STAGE="$EXEDIR/staging" -OPTIMIZE=-Oz -MINSIZE="-flto=auto -ffunction-sections -fdata-sections" -LDMINSIZE="-Wl,--gc-sections -flto=auto" -CFLAGS="" -LDFLAGS="-lgcc_eh" -HOSTCC=cc -LUA_VER="5.5" -LUA_RELEASE="5.5.0" -LUAJIT_VER="2.1" -LUAJIT_RELEASE="2.1-20250826" -LUAJIT_LUAVER="5.1" +OPTIMIZE=${OPTIMIZE:--Oz} +MINSIZE="${MINSIZE:--flto=auto -ffunction-sections -fdata-sections}" +LDMINSIZE="${LDMINSIZE:--Wl,--gc-sections -flto=auto}" +#CFLAGS="" +LDFLAGS="-lgcc_eh $LDFLAGS" +HOSTCC=${HOSTCC:-cc} +LUA_VER=${LUA_VER:-5.5} +LUA_RELEASE=${LUA_RELEASE:-5.5.0} +LUAJIT_VER=${LUAJIT_VER:-2.1} +LUAJIT_RELEASE=${LUAJIT_RELEASE:-2.1-20250826} +LUAJIT_LUA_VER=${LUAJIT_LUA_VER:-5.1} nproc=$(nproc) TARGETS="\