[Libreoffice-commits] core.git: cross_toolset/Makefile cross_toolset/prj cross_toolset/README Makefile.in

Peter Foley pefoley2 at verizon.net
Mon Feb 18 04:08:10 PST 2013


 Makefile.in                 |    2 +-
 cross_toolset/Makefile      |   15 ---------------
 cross_toolset/README        |    3 ---
 cross_toolset/prj/build.lst |    1 -
 4 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 162a4f8d01210bed52f348b74e076ff245c33309
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Fri Feb 15 14:26:56 2013 -0500

    remove cross_toolset
    
    Change-Id: Ib707b3d17a2e091c150dc116f01c8d151d9461eb
    Reviewed-on: https://gerrit.libreoffice.org/2193
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/Makefile.in b/Makefile.in
index 8f87840..e3472d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -297,7 +297,7 @@ cross-toolset: bootstrap fetch
 # platform. see --with-cross-build in icu/ExternalProject_icu.mk
 	$(GNUMAKE) gb_Side=build icu
 #
-	cd cross_toolset && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+	cd cross_tail_build && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 
 #
 # Install
diff --git a/cross_toolset/Makefile b/cross_toolset/Makefile
deleted file mode 100644
index 1694f3a..0000000
--- a/cross_toolset/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This build the modules needed on the build side for a cross-compilation
-#
-
-SHELL=/usr/bin/env bash
-include ../config_build.mk
-
-export gb_Side=build
-
-.PHONY : build
-
-build:
-	$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
-
diff --git a/cross_toolset/README b/cross_toolset/README
deleted file mode 100644
index d6fb478..0000000
--- a/cross_toolset/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Builds internal tools necessary for cross-compilation
-
-This is a meta-module that directs the build of all necessary modules.
diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst
deleted file mode 100644
index 94988a3..0000000
--- a/cross_toolset/prj/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-crs	cross_toolset	::	cross_tail_build NULL
diff --git a/cross_toolset/prj/dmake b/cross_toolset/prj/dmake
deleted file mode 100644
index e69de29..0000000


More information about the Libreoffice-commits mailing list