From 8d488bafe5d1aac82018e7b12e5ecaab5ede5342 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sun, 5 Feb 2012 22:54:18 -0600
Subject: another tweak to bootstrap handling

---
 solenv/gbuild/extensions/post_BuildplTargets.mk | 4 ++--
 solenv/gbuild/partial_build.mk                  | 2 +-
 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
 
-- 
cgit