diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 22:00:39 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 22:00:39 -0600 |
| commit | 8b212711cf09492e07d05b62360d7960d3b0178c (patch) | |
| tree | 020f6c73194ef864aa7859a9b822abc70dc5f39e | |
| parent | still invalid use of WORKDIR in top level Makefile (diff) | |
| download | core-8b212711cf09492e07d05b62360d7960d3b0178c.tar.gz core-8b212711cf09492e07d05b62360d7960d3b0178c.zip | |
darn! finally bootstrap target (seems to) works on windows... and other
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_BuildplTargets.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/partial_build.mk | 8 |
3 files changed, 17 insertions, 10 deletions
@@ -352,8 +352,11 @@ config_host.mk : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in auto # # Bootstap # +$(WORKDIR)/bootstrap: + @cd $(SRCDIR) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ -bootstrap: $(SRCDIR)/workdir/$(INPATH)/bootstrap +bootstrap: $(WORKDIR)/bootstrap # # Fetch @@ -362,7 +365,7 @@ fetch: src.downloaded src.downloaded : autogen ooo.lst download ifeq ($(DO_FETCH_TARBALLS),YES) - ./download $(SRCDIR)/ooo.lst && touch $@ + @./download $(SRCDIR)/ooo.lst && touch $@ else @echo "Automatic fetching of external tarballs is disabled." endif diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index 8bd315188225..2c632d6cb325 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -27,10 +27,6 @@ .PHONY: cross-build-toolset dev-install build findunusedcode -$(SRCDIR)/workdir/$(INPATH)/bootstrap: - @cd $(SRCDIR) && ./bootstrap - @mkdir -p $(dir $@) && touch $@ - ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl) .DEFAULT_GOAL=all @@ -110,7 +106,7 @@ endef # the build order dependencies are rather ugly... dev-install: \ - $(SRCDIR)/workdir/$(INPATH)/bootstrap \ + bootstrap \ $(SRCDIR)/src.downloaded \ $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \ | $(filter build,$(MAKECMDGOALS)) \ @@ -177,11 +173,11 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) -dev-install: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) +dev-install: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) -build: $(SRCDIR)/workdir/$(INPATH)bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) +build: bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) -cross_toolset: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded +cross_toolset: bootstrap $(SRCDIR)/src.downloaded findunusedcode: diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index 808917b937d1..2059514ef9ab 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -1,4 +1,6 @@ +.PHONY : bootstrap + gb_PARTIALBUILD := T ifeq ($(SOLARENV),) @@ -8,6 +10,12 @@ endif include $(module_directory)/../config_$(gb_Side).mk endif +$(WORKDIR)/bootstrap: + @cd $(SRCDIR) && ./bootstrap + @mkdir -p $(dir $@) && touch $@ + +bootstrap: $(WORKDIR)/bootstrap + gb_SourceEnvAndRecurse_STAGE=gbuild include $(SOLARENV)/gbuild/gbuild.mk |