diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-05-22 17:21:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-05-23 10:18:48 +0200 |
| commit | fe3fb5ecd3b66e32cc5aa64a2afffa572353740e (patch) | |
| tree | d7b220ff31d97e4f5c12fad03f466f6210e76c46 /Makefile.in | |
| parent | 04e27df3c162f1df02f061b94434a38d1eaa3a46 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 2 insertions, 0 deletions
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 |