From 79422b3a361e71217d85510583b92c1b023f6642 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Fri, 21 Feb 2025 01:17:23 +0800 Subject: [PATCH] Target armv8-a for Linux/Arm64 portable builds build Signed-off-by: nyanmisaka --- builder/images/base-linuxarm64/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/images/base-linuxarm64/Dockerfile b/builder/images/base-linuxarm64/Dockerfile index 476fa66c567..3bea67ec688 100644 --- a/builder/images/base-linuxarm64/Dockerfile +++ b/builder/images/base-linuxarm64/Dockerfile @@ -43,7 +43,7 @@ RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /op ENV FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu ENV PATH="/opt/ct-ng/bin:${PATH}" \ - FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --pkg-config-flags=--static --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --target-os=linux" \ + FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --pkg-config-flags=--static --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --cpu=armv8-a --target-os=linux" \ FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \ FFBUILD_RUST_TARGET="aarch64-unknown-linux-gnu" \ FFBUILD_PREFIX=/opt/ffbuild \ @@ -56,8 +56,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \ AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \ RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \ NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \ - CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \ - CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \ - LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \ + CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -march=armv8-a -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \ + CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -march=armv8-a -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \ + LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -march=armv8-a -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \ STAGE_CFLAGS="-fvisibility=hidden -fno-semantic-interposition" \ STAGE_CXXFLAGS="-fvisibility=hidden -fno-semantic-interposition"