strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Install GDB pretty printers into cross-toolset

Browse source 
Change-Id: Id42dd694514e104d03c649a19788b5c192ec35a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116116
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2021-05-20 15:51:21 +02:00
parent a2a98f6218
commit 70e4c65058
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.in
View file

@ -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