diff options
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/partial_build.mk | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 633fed12760b..6316cd809d4d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -216,10 +216,10 @@ bootstrap: compilerplugins # Build # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild all slowcheck + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild -build-nocheck : export SKIP_TESTS := YES -build-nocheck : build +build-nocheck: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build cross-toolset: bootstrap fetch $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild @@ -325,8 +325,8 @@ else ifeq ($(OS),MACOSX) @echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice" endif -dev-install-nocheck : export SKIP_TESTS := YES -dev-install-nocheck : dev-install +dev-install-nocheck: build-nocheck + $(MAKE) dev-install -o build dev-update: ifeq ($(DISABLE_LINKOO),TRUE) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 0e694e5f6173..80e90bbf8400 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -92,7 +92,7 @@ $(call gb_Module_get_target,%) : .PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations .DEFAULT_GOAL := all -all : build unitcheck +all : build unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck) build : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) @@ -197,7 +197,6 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -ifeq ($(strip $(SKIP_TESTS)),) define gb_Module_add_check_target $(call gb_Module__read_targetfile,$(1),$(2),check target) @@ -213,7 +212,6 @@ $(call gb_Module_get_slowcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -endif # SKIP_TESTS define gb_Module_add_subsequentcheck_target $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index aa7def4c9a58..9c7f3fb3b750 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -5,6 +5,7 @@ ifeq ($(SOLARENV),) include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../../config_$(gb_Side).mk endif +gb_PARTIAL_BUILD := T include $(SOLARENV)/gbuild/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(shell ls $(module_directory)/Module*.mk))) +$(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)/Module*.mk))) |