summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2020-06-29 10:15:48 +0300
committerTor Lillqvist <tml@collabora.com>2020-07-05 00:01:40 +0200
commit86884f876ed2c9e8d4690d8ae746de51f93e43d4 (patch)
tree069ec23c99663d191cce1ba71a50e8d8b3a23fe9
parente3adb51c54089a961cea1a33c5f54f6e552a4590 (diff)
For macOS on arm64, be sure to use HOST_PLATFORM=arm64-apple-darwin
(That is for the external projects.) Change-Id: I709ff37ebca304f862ff94bdb1c6e6035f5cda77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97981 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index d477665acc28..efe8fb83b67b 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