Kaydet (Commit) 8d488baf authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

another tweak to bootstrap handling

üst fb78dbcd
...@@ -173,9 +173,9 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl ...@@ -173,9 +173,9 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl
ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) 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 cross_toolset: bootstrap $(SRCDIR)/src.downloaded
......
...@@ -11,7 +11,7 @@ include $(module_directory)/../config_$(gb_Side).mk ...@@ -11,7 +11,7 @@ include $(module_directory)/../config_$(gb_Side).mk
endif endif
$(WORKDIR)/bootstrap: $(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap @cd $(SRC_ROOT) && ./bootstrap
@mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@) && touch $@
bootstrap: $(WORKDIR)/bootstrap bootstrap: $(WORKDIR)/bootstrap
......
...@@ -31,6 +31,12 @@ ifeq ($(strip $(SOLARENV)),) ...@@ -31,6 +31,12 @@ ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_host.mk include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_host.mk
endif endif
$(WORKDIR)/bootstrap:
@cd $(SRC_ROOT) && ./bootstrap
@mkdir -p $(dir $@) && touch $@
bootstrap: $(WORKDIR)/bootstrap
gb_SourceEnvAndRecurse_STAGE=gbuild gb_SourceEnvAndRecurse_STAGE=gbuild
include $(SOLARENV)/gbuild/gbuild.mk include $(SOLARENV)/gbuild/gbuild.mk
......
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