[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 74c2e23b2d3c27d9968bc8791053ff37d177da71
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Jun 29 10:15:48 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sun Nov 15 10:09:17 2020 +0100

    For macOS on arm64, be sure to use HOST_PLATFORM=arm64-apple-darwin
    
    (That is for external projects.)
    
    Change-Id: I709ff37ebca304f862ff94bdb1c6e6035f5cda77
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97981
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105870
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/configure.ac b/configure.ac
index 31d91858ca04..4efb2c3381df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -706,6 +706,11 @@ darwin*|macos*) # macOS
 
     # -undefined error is the default
     LINKFLAGSNOUNDEFS=""
+    if test "$host_cpu" = arm64; then
+        # HOST_PLATFORM is used for external projects and their configury occasionally doesn't like
+        # the "macos" part so be sure to use arm64-apple-darwin for now.
+        HOST_PLATFORM=arm64-apple-darwin
+    fi
 ;;
 
 ios*) # iOS