diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a5e13b..6e000fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,13 +99,12 @@ jobs: export STRIP=$TARGET-strip export PKG_CONFIG_PATH=$DEPS_DIR/lib/pkgconfig export STAGING_DIR=$RUNNER_TEMP + STATIC=-static if [ "$ARCH" = lexra ]; then LEXRA=1 OPTIMIZE=-Os - STATIC=-static else OPTIMIZE=-Oz - STATIC=-static-pie fi MINSIZE="$OPTIMIZE $MINSIZE" @@ -114,7 +113,7 @@ jobs: wget -qO- https://www.lua.org/ftp/lua-${LUA_RELEASE}.tar.gz | tar -xz ( cd lua-${LUA_RELEASE} - make CC=$CC AR="$AR rc" CFLAGS="$PIC $MINSIZE $CFLAGS" LDFLAGS="$LDMINSIZE $LDFLAGS" linux -j$(nproc) + make CC=$CC AR="$AR rc" CFLAGS="$MINSIZE $CFLAGS" LDFLAGS="$LDMINSIZE $LDFLAGS" linux -j$(nproc) make install INSTALL_TOP=$DEPS_DIR INSTALL_BIN=$DEPS_DIR/bin INSTALL_INC=$DEPS_DIR/include/lua${LUA_VER} INSTALL_LIB=$DEPS_DIR/lib ) LJIT=0 @@ -132,7 +131,7 @@ jobs: esac ( cd luajit2-* - make BUILDMODE=static XCFLAGS="-DLUAJIT_DISABLE_FFI $PIC" HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$PIC $MINSIZE $CFLAGS" TARGET_LDFLAGS="$LDMINSIZE $LDFLAGS" -j$(nproc) + make BUILDMODE=static XCFLAGS="-DLUAJIT_DISABLE_FFI" HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$MINSIZE $CFLAGS" TARGET_LDFLAGS="$LDMINSIZE $LDFLAGS" -j$(nproc) make install PREFIX= DESTDIR=$DEPS_DIR ) LJIT=1 @@ -148,7 +147,7 @@ jobs: for i in libmnl libnfnetlink libnetfilter_queue ; do ( cd $i-* - CFLAGS="$PIC $MINSIZE $CFLAGS" \ + CFLAGS="$MINSIZE $CFLAGS" \ LDFLAGS="$LDMINSIZE $LDFLAGS" \ ./configure --prefix= --host=$TARGET --enable-static --disable-shared --disable-dependency-tracking make install -j$(nproc) DESTDIR=$DEPS_DIR @@ -161,7 +160,7 @@ jobs: xargs -I{} wget -qO- https://github.com/madler/zlib/archive/refs/tags/{}.tar.gz | tar -xz ( cd zlib-* - CFLAGS="$PIC $MINSIZE $CFLAGS" \ + CFLAGS="$MINSIZE $CFLAGS" \ ./configure --prefix= --static make install -j$(nproc) DESTDIR=$DEPS_DIR )