diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-06-29 10:15:48 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-23 17:01:23 +0100 |
| commit | 6aa2571083a0a616063c3540520b2fd25210704b (patch) | |
| tree | ce8297d79037962fcf15ceb3bfa731ff6f98b7b8 | |
| parent | Fix apr build with current Xcode: Include <stdlib.h> for exit() (diff) | |
| download | core-6aa2571083a0a616063c3540520b2fd25210704b.tar.gz core-6aa2571083a0a616063c3540520b2fd25210704b.zip | |
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.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e739513c0b33..83e4b6c3e10a 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 |