diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 22:54:18 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 22:54:35 -0600 |
| commit | 8d488bafe5d1aac82018e7b12e5ecaab5ede5342 (patch) | |
| tree | 6042a97ceb67d0f380d66c823b94e72ef0571124 | |
| parent | fb78dbcdc5a76997856285af3b041ffd087c40a5 (diff) | |
another tweak to bootstrap handling
| -rw-r--r-- | solenv/gbuild/extensions/post_BuildplTargets.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/partial_build.mk | 2 | ||||
| -rw-r--r-- | tail_build/Makefile | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 2c632d6cb325..58f12e826dc6 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -173,9 +173,9 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) -dev-install: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) +dev-install: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) -build: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) +build: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) cross_toolset: bootstrap $(SRCDIR)/src.downloaded diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index 2059514ef9ab..e95a0a6ddea4 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -11,7 +11,7 @@ include $(module_directory)/../config_$(gb_Side).mk endif $(WORKDIR)/bootstrap: - @cd $(SRCDIR) && ./bootstrap + @cd $(SRC_ROOT) && ./bootstrap @mkdir -p $(dir $@) && touch $@ bootstrap: $(WORKDIR)/bootstrap diff --git a/tail_build/Makefile b/tail_build/Makefile index 4ee91d83dfa2..d89204e9e100 100644 --- a/tail_build/Makefile +++ b/tail_build/Makefile @@ -31,6 +31,12 @@ ifeq ($(strip $(SOLARENV)),) include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_host.mk endif +$(WORKDIR)/bootstrap: + @cd $(SRC_ROOT) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ + +bootstrap: $(WORKDIR)/bootstrap + gb_SourceEnvAndRecurse_STAGE=gbuild include $(SOLARENV)/gbuild/gbuild.mk |