diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-06-29 01:18:16 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-23 21:00:18 +0100 |
| commit | 239aa14a52decd7978001ac4de1f763f753de716 (patch) | |
| tree | 83fce5705b7f50de1a3528a5e05971e8d03cf491 /Makefile.gbuild | |
| parent | For macOS on arm64, be sure to use HOST_PLATFORM=arm64-apple-darwin (diff) | |
| download | core-239aa14a52decd7978001ac4de1f763f753de716.tar.gz core-239aa14a52decd7978001ac4de1f763f753de716.zip | |
More WIP work for macOS on Apple Silicon
If cross-compiling to a DESKTOP platform, use
RepositoryModule_host.mk on the build platform, too.
Change-Id: Icd3f3081e5af0c7cda95e9bce7572d37567d4f6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97356
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105869
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106369
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'Makefile.gbuild')
| -rw-r--r-- | Makefile.gbuild | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild index cd7fc973c287..c90a9feee3a9 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -18,7 +18,12 @@ include $(BUILDDIR)/config_$(gb_Side).mk include $(SRCDIR)/solenv/gbuild/gbuild.mk +# If cross-compiling to a DESKTOP platform, just use RepositoryModule_host.mk on the build platform, too +ifeq ($(gb_Side)-$(filter DESKTOP,$(BUILD_TYPE_FOR_HOST)),build-DESKTOP) +$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_host.mk)) +else $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk)) +endif upload-symbols: bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)" |