Makefile.in | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit a3f66d2d1d12bb7a308595b1b0ab96a7acab12d8
Author: jan Iversen <j...@libreoffice.org>
Date: Wed May 24 07:38:58 2017 +0200
fixing fe3fb5ecd3b66e32cc5aa64a2afffa572353740e for iOS
the new cross-toolset target does not work for iOS
(the old way worked as it should)
the "fetch" target causes problems.
Change-Id: I19d2949f04a968ebd9813f635dc21cae0559a4e7
diff --git a/Makefile.in b/Makefile.in
index 63c404fce3be..6aa98cfe97ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,7 +276,9 @@ help showmodules gbuildtojson:
cross-toolset: bootstrap fetch
# fetch again in case there are externals only needed on build platform
+ifneq ($(OS),IOS)
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile fetch
+endif
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build-tools
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
