Makefile.gbuild | 5 +++++
RepositoryModule_build.mk | 36 ------------------------------------
2 files changed, 5 insertions(+), 36 deletions(-)
New commits:
commit 239aa14a52decd7978001ac4de1f763f753de716
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Mon Jun 29 01:18:16 2020 +0300
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 23 21:00:18 2020 +0100
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 <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105869
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106369
Reviewed-by: Caolán McNamara <caol...@redhat.com>
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)"
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 541940515eba..9537ccd1d770 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -55,42 +55,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
unotools \
ure \
xmlreader \
- $(call gb_Helper_optional_for_host,DESKTOP, \
- $(if $(WITH_GALLERY_BUILD), \
- avmedia \
- basic \
- canvas \
- configmgr \
- connectivity \
- cppcanvas \
- drawinglayer \
- editeng \
- extensions \
- filter \
- framework \
- linguistic \
- mysqlc \
- officecfg \
- package \
- postprocess \
- sfx2 \
- sot \
- svgio \
- emfio \
- svl \
- svtools \
- svx \
- swext \
- toolkit \
- ucb \
- unoxml \
- vcl \
- xmloff \
- xmlscript \
- ) \
- helpcompiler \
- xmlhelp \
- ) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
