summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2020-06-29 10:15:48 +0300
committerTor Lillqvist <tml@iki.fi>2020-12-05 01:23:46 +0200
commit9aed9f8602137eb3fbad6a932234e1340c538f00 (patch)
tree9d126e9669603b9d9956c96db35e8af10cd8df15
parent19719f910e6d0c65c134af30b9fdbf4bdd07f369 (diff)
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@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105870 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106370 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 314256b822fc..7835912f7395 100644
--- a/configure.ac
+++ b/configure.ac
@@ -701,6 +701,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