[Libreoffice-commits] .: cross_toolset/Makefile solenv/gbuild

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Mon Feb 6 01:59:24 PST 2012


 cross_toolset/Makefile                          |    9 ---------
 solenv/gbuild/extensions/post_BuildplTargets.mk |    2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 96ae2271ebc8fafd5a2454705c128725070ca7c3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Feb 6 03:58:55 2012 -0600

    fix mingw build, still bootstrap issues.

diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile
index 5b80d7b..2448493 100644
--- a/cross_toolset/Makefile
+++ b/cross_toolset/Makefile
@@ -6,15 +6,6 @@
 SHELL=/usr/bin/env bash
 include ../config_build.mk
 
-#
-# Bootstap
-#
-$(WORKDIR)/bootstrap:
-	@cd $(SRC_ROOT) && ./bootstrap
-	@mkdir -p $(dir $@) && touch $@
-
-bootstrap: $(WORKDIR)/bootstrap
-
 .PHONY : build
 
 build:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 58f12e8..1aba6f2 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -177,7 +177,7 @@ dev-install: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD
 
 build: $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 
-cross_toolset: bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(SRCDIR)/src.downloaded
 
 findunusedcode:
 


More information about the Libreoffice-commits mailing list