diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 5e46409dcf17..a9764bf378d9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -229,8 +229,11 @@ bootstrap: compilerplugins # # Build # +# Note: if invoked as "make check" this will also run subsequentcheck! +# build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \ + all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) install-gdb-printers -a $(INSTDIR) endif @@ -373,7 +376,8 @@ findunusedcode: | grep -v ^WSObject \ > unusedcode.easy -check: build subsequentcheck +# the actual running of subsequentcheck is now done in "build" target => faster +check: build dump-deps: @$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 7b3aad94fbf6..98930ed1ccd4 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -229,10 +229,14 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef +# has order dependency on AllModulesButInstsetNative to be able to run +# subsequentcheck in the same make process on "make check" define gb_Module_add_subsequentcheck_target $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) $(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$$(gb_Module_CURRENTTARGET) :| \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef |