summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2017-05-24 07:38:58 +0200
committerjan Iversen <jani@libreoffice.org>2017-05-24 07:40:50 +0200
commita3f66d2d1d12bb7a308595b1b0ab96a7acab12d8 (patch)
treef24ad381f2ab91ce4bb4c1647e5dc70729e83684 /Makefile.in
parentd4cd8677889ec3807c194ef5b462f8e031807e5b (diff)
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
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in2
1 files changed, 2 insertions, 0 deletions
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