Kaydet (Commit) ab225eea authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

only depend from dev-install on build if it is an explicit goal

üst 2ca9a7e8
...@@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) : ...@@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) :
&& echo "see full error log at $@.log" \ && echo "see full error log at $@.log" \
&& echo "to rerun just this failed test without all others, run:" \ && echo "to rerun just this failed test without all others, run:" \
&& echo && echo " make $@" && echo \ && 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 "Or to do interactive debugging, run two shells with (Linux only):" \
&& echo \ && echo \
&& echo " make debugrun" \ && echo " make debugrun" \
......
...@@ -100,14 +100,12 @@ gb_MAKETARGET=build ...@@ -100,14 +100,12 @@ gb_MAKETARGET=build
endif endif
endif endif
gb_BuildplTarget_COMPLETEDTARGETS=
define gb_BuildplTarget_command 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) 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 endef
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))
$(call gb_BuildplTarget_command,smoketestoo_native,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all)) $(call gb_BuildplTarget_command,smoketestoo_native,--from instsetoo_native)
build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,instsetoo_native,--all) $(call gb_BuildplTarget_command,instsetoo_native,--all)
...@@ -154,7 +152,7 @@ ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) ...@@ -154,7 +152,7 @@ ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
clean: clean-host clean-build 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) build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment