Fix ARM flags

diff --git a/debian/rules b/debian/rules
index dbb9bb505154cee145e33bb83cab9f4057459113..5031645854249c8d577de0b810c12edffe12559d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,6 @@ FLAGS_ARGEO=-O3 -g -DNDEBUG
 # GGML_NATIVE:ON corresponds to -march=native
 CMAKE_OPTS  = -DGGML_NATIVE=OFF \
               -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-              -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \
-              -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \
               -DGGML_BUILD_NUMBER=$(GGML_BUILD_NUMBER) \
               -DGGML_BUILD_TESTS=OFF \
               -DGGML_BUILD_EXAMPLES=OFF \
@@ -42,8 +40,8 @@ ifeq ($(DEB_TARGET_ARCH),arm64)
 ifeq ($(distribution),Ubuntu)
 # Optimize for Raspberry Pi 5 on Ubuntu
 CMAKE_OPTS += -DGGML_CPU_ALL_VARIANTS=OFF \
-              -DGGML_CPU_ARM_ARCH="cortex-a76+crc+crypto" \
-              -DCMAKE_REQUIRED_FLAGS="-mtune=cortex-a76+crc+crypto"
+              -DGGML_CPU_ARM_ARCH=armv8.4-a
+FLAGS_ARGEO+= -mcpu=cortex-a76+crc+crypto
 else
 CMAKE_OPTS += -DGGML_CPU_ALL_VARIANTS=OFF \
               -DGGML_CPU_ARM_ARCH=armv8-a
@@ -62,6 +60,9 @@ endif
 
 endif # arm64
 
+CMAKE_OPTS += -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \
+              -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \
+
 # Use build/ for output, so that it is in the .gitignore of upstream
 %:
        dh $@ --buildsystem=cmake \