[vlc-commits] extras: fix native compilation for ARM-64 on macOS

[Felix Paul Kühne]

vlc/vlc-3.0 | branch: master | Felix Paul Kühne <felix at feepk.net> | Sun Dec  6 17:09:19 2020 +0100| [bdf8adeb05542e45492f117b57fdc1f33a6903e1] | committer: Felix Paul Kühne

extras: fix native compilation for ARM-64 on macOS

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=bdf8adeb05542e45492f117b57fdc1f33a6903e1
---

 extras/package/macosx/build.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index c89b8d582b..bbfa66f444 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -63,6 +63,14 @@ get_actual_arch() {
     fi
 }
 
+get_buildsystem_arch() {
+    if [ "$1" = "arm64" ]; then
+        echo "aarch64"
+    else
+        echo "$1"
+    fi
+}
+
 while getopts "hvrcpi:k:a:j:C:b:" OPTION
 do
      case $OPTION in
@@ -123,9 +131,10 @@ if [ "$QUIET" = "yes" ]; then
     out="/dev/null"
 fi
 
+ACTUAL_ARCH=`get_actual_arch $ARCH`
+BUILD_ARCH=`get_buildsystem_arch $BUILD_ARCH`
 BUILD_TRIPLET=$BUILD_ARCH-apple-darwin$OSX_KERNELVERSION
 HOST_TRIPLET=$ARCH-apple-darwin$OSX_KERNELVERSION
-ACTUAL_ARCH=`get_actual_arch $ARCH`
 
 info "Building VLC for macOS for architecture ${ACTUAL_ARCH} on a ${BUILD_ARCH} device"