From fe3fb5ecd3b66e32cc5aa64a2afffa572353740e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 22 May 2017 17:21:51 +0200 Subject: Makefile: try to fix downloading externals for build platform When cross-compiling, it's possible that an external is only used on the build platform and not the host platform. Attempt to fix this by invoking "make fetch" twice; it looks like this should not be combined with the exising "build-tools" invocation because that needs to be delayed until everything is fetched. Change-Id: I42626a30359d54dce3c0a5a8ea07045c099cea59 Reviewed-on: https://gerrit.libreoffice.org/37912 Tested-by: Jenkins Reviewed-by: Michael Stahl --- Makefile.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 0af8a53373a3..63c404fce3be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -275,6 +275,8 @@ help showmodules gbuildtojson: $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ cross-toolset: bootstrap fetch + # fetch again in case there are externals only needed on build platform + $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile fetch $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools -- cgit