diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-20 15:51:21 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-25 20:04:54 +0200 |
| commit | 70e4c65058a76131235cd04b64231c403cbe74f3 (patch) | |
| tree | c3f6d3936b54f0f776f7a0a832721da65aa6ad23 /Makefile.in | |
| parent | fix some crypto leaks (diff) | |
| download | core-70e4c65058a76131235cd04b64231c403cbe74f3.tar.gz core-70e4c65058a76131235cd04b64231c403cbe74f3.zip | |
Install GDB pretty printers into cross-toolset
Change-Id: Id42dd694514e104d03c649a19788b5c192ec35a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116116
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 8e56cd47b28b..b75d07bd137b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -280,9 +280,8 @@ bootstrap: check-if-root compilerplugins # Note: this will pipe through all gbuild targets to ... gbuild # with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons # -build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \ - $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) \ - install-gdb-printers +build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset,install-gdb-printers) \ + $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) ifeq ($(OS),iOS) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios @@ -293,7 +292,7 @@ build-non-l10n-only build-l10n-only build-nocheck check debugrun translations pa help showmodules gbuildtojson: $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ -cross-toolset: bootstrap fetch +cross-toolset: bootstrap fetch install-gdb-printers # fetch again in case there are externals only needed on build platform ifneq ($(OS),iOS) $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(BUILDDIR)/Makefile fetch @@ -302,6 +301,10 @@ endif install-gdb-printers: ifneq ($(filter-out WNT MACOSX iOS,$(OS)),) +ifneq ($(INSTDIR_FOR_BUILD),$(INSTDIR)) + mkdir -p $(INSTDIR_FOR_BUILD) + $(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR_FOR_BUILD) -c +endif mkdir -p $(INSTDIR) $(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c endif |