summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2020-06-29 10:15:48 +0300
committerTor Lillqvist <tml@collabora.com>2020-11-15 10:09:17 +0100
commit74c2e23b2d3c27d9968bc8791053ff37d177da71 (patch)
tree7f7a47e18a321af620e94fe2a5d59a6e41e6609f
parent54a1a9aa6d5fc2e6d545647104d29ce227cbc2a4 (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>
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
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