diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-10 14:26:14 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-18 15:44:01 +0000 |
| commit | a811e047be0bb30a7648d540f9a9c8a5bdae8f67 (patch) | |
| tree | b7a22e2bb27209e9ac7fce039e83d4bfbaf3ffac /Makefile.in | |
| parent | 7f51d6fa0d6d38532cee447ffc65dea4b3583d7c (diff) | |
Make building of cross-toolset build.pl and dmake free.
Adds more modules to Module_cross_*.mk.
Change-Id: I9a7a12ff07649262355bfa82bdf09fbf93b1530e
Reviewed-on: https://gerrit.libreoffice.org/2240
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index e3472d6bba54..c9f223764988 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,7 @@ else # MAKE_RESTARTS all: build ifeq ($(gb_Side),) -export gb_Side:=host +gb_Side:=host endif include $(BUILDDIR)/config_$(gb_Side).mk @@ -291,13 +291,11 @@ endif build-nocheck : export SKIP_TESTS := YES build-nocheck : build +# Ideally solenv would be also in Module_cross_toolset.mk +# but one would need to chase and add missing dependencies. cross-toolset: bootstrap fetch -# We need to build icu for the build platform, as building icu for the host -# platform requires tools built as part of icu that can run on the build -# platform. see --with-cross-build in icu/ExternalProject_icu.mk - $(GNUMAKE) gb_Side=build icu -# - cd cross_tail_build && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) + $(GNUMAKE) gb_Side=build solenv + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.cross # # Install |