[vlc-devel] [PATCH 1/2] build.sh: rpi: no -mfpu=neon for aarch64

[Francois Cartegnie]

---
 extras/package/raspberry/build.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/extras/package/raspberry/build.sh b/extras/package/raspberry/build.sh
index a3c4dff2f2..272f742f03 100755
--- a/extras/package/raspberry/build.sh
+++ b/extras/package/raspberry/build.sh
@@ -71,10 +71,12 @@ case $ARCH in
     aarch64)
         SHORTARCH="linuxarm64"
         EABI="gnu"
+        NEON=""
         ;;
     arm)
         SHORTARCH="linuxarm"
         EABI="gnueabihf"
+        NEON="-mfpu=neon"
         ;;
     *)
         usage
@@ -118,9 +120,9 @@ CONTRIBFLAGS="$CONTRIBFLAGS --disable-x265"
 ${SCRIPT_PATH}/../../../contrib/bootstrap --host=$TRIPLET $CONTRIBFLAGS
 
 # use the system headers for the OS and firmware
-export CFLAGS="$CFLAGS -g -mfpu=neon -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
-export CXXFLAGS="$CXXFLAGS -g -mfpu=neon -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
-export CPPFLAGS="$CPPFLAGS -g -mfpu=neon -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
+export CFLAGS="$CFLAGS -g $NEON -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
+export CXXFLAGS="$CXXFLAGS -g $NEON -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
+export CPPFLAGS="$CPPFLAGS -g $NEON -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
 export LDFLAGS="$LDFLAGS -L/usr/$TRIPLET/lib -L/opt/vc/lib"
 
 # Rebuild the contribs or use the prebuilt ones
-- 
2.25.4