diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-29 13:07:22 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-29 13:09:51 +0100 |
| commit | a0732d042f7304abb5c7194adcb8bf1948c96d55 (patch) | |
| tree | 55751b03db1fe925801eeb6cf5427dde18209643 /solenv | |
| parent | b8a2970f24872ee1620f3cc2381055b14484dd63 (diff) | |
do incemental build from instsetoo_native to smoketest, if both are needed
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_BuildplTargets.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 74ce55320275..592f590a25bd 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -52,20 +52,23 @@ gb_MAKETARGET=build endif endif +gb_BuildplTarget_COMPLETEDTARGETS= define gb_BuildplTarget_command -cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET) +cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET) +$(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1)) endef .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build -smoketestoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) - $(call gb_BuildplTarget_command,$@) +smoketestoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | instsetoo_native + $(call gb_BuildplTarget_command,$@,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all)) + echo $@ instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) - $(call gb_BuildplTarget_command,$@) + $(call gb_BuildplTarget_command,$@,--all) cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded - source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@) + source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all) dev-install: smoketestoo_native |