diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-06 17:15:44 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-07 15:53:06 +0100 |
| commit | ab225eead3fb14c5acf89690965b9b24db4d97e3 (patch) | |
| tree | 7009a44440125acf95c49335fd2f240fd8a6f96e | |
| parent | 2ca9a7e82c97df06730301bdd740f55ac447dc95 (diff) | |
only depend from dev-install on build if it is an explicit goal
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_BuildplTargets.mk | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 5ce0b3f31da2..5afe59580bb9 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) : && echo "see full error log at $@.log" \ && echo "to rerun just this failed test without all others, run:" \ && echo && echo " make $@" && echo \ - && echo "cd into the module dir if you do not want a full dev-install run" \ + && echo "cd into the module dir to run the tests faster" \ && echo "Or to do interactive debugging, run two shells with (Linux only):" \ && echo \ && echo " make debugrun" \ diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 01dc08a99529..66bb98a04152 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -100,14 +100,12 @@ gb_MAKETARGET=build endif endif -gb_BuildplTarget_COMPLETEDTARGETS= define gb_BuildplTarget_command cd $(SRCDIR)/$(1) && unset MAKEFLAGS && export gb_SourceEnvAndRecurse_STAGE=gbuild && $(SOLARENV)/bin/build.pl $(if $(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) -- -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET) -$(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1)) endef -dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build - $(call gb_BuildplTarget_command,smoketestoo_native,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all)) +dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) + $(call gb_BuildplTarget_command,smoketestoo_native,--from instsetoo_native) build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) $(call gb_BuildplTarget_command,instsetoo_native,--all) @@ -154,7 +152,7 @@ ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) clean: clean-host clean-build -dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build +dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) |