Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 02d931a59e2966d0c2736db8dee7be3e3dcd6bae
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Sun Jul 5 21:36:57 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Jul 6 01:07:35 2020 +0200
When cross-compiling to DESKTOP, just make "build" for the build platform
Trying to fine-tune that exactly what is needed but nothing else is
built is very painful.
For instance, on macOS, if you build gengal but not soffice, you end
up with this error when trying to run the built gengal, because there
is no Info.plist in the app bundle in instdir_for_build: "No
Info.plist file in application bundle or no NSPrincipalClass in the
Info.plist file, exiting"
Change-Id: I63d766f0e7e72f55454d16c72c32e153cf976443
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98177
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/Makefile.in b/Makefile.in
index d0d19f9e0545..2f02914a8a82 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,7 +294,7 @@ cross-toolset: bootstrap fetch
ifneq ($(OS),iOS)
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f
$(BUILDDIR)/Makefile fetch
endif
- $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build-tools
+ $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild $(if $(filter
DESKTOP,$(BUILD_TYPE)),build,build-tools)
install-gdb-printers:
ifneq ($(filter-out WNT MACOSX iOS,$(OS)),)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
