diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-08-19 15:01:17 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-19 15:36:18 +0200 |
commit | 81ca6d858b2e50ded7a4f713cc134a13c1fbf886 (patch) | |
tree | dfc4acfe74d9c74e47a5bad864d2b7474768fefe /Makefile.in | |
parent | deliver also unotools.hxx (diff) | |
download | core-81ca6d858b2e50ded7a4f713cc134a13c1fbf886.tar.gz core-81ca6d858b2e50ded7a4f713cc134a13c1fbf886.zip |
Allow parallel build of the the cross build toolset.
Plus various minor build tweaks.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 84 |
1 files changed, 9 insertions, 75 deletions
diff --git a/Makefile.in b/Makefile.in index b39b1512484f..8090bcb6e740 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,86 +8,19 @@ else GBUILD_OPT:=--gmake endif -ifeq (@CROSS_COMPILING@,YES) -all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset -else -all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded -endif +all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset.built @. ./Env.Host.sh && \ cd instsetoo_native && \ build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ +cross-build-toolset.built: ifeq (@CROSS_COMPILING@,YES) -cross-build-toolset: -# Build necessary modules for the *build* platform, i.e. those needed -# by tools run at build time. Sure, in many of these modules only a -# part of the produced binaries are actually used then in the build. -# Once everything is handled by gbuild, this can hopefully be streamlined. - . ./Env.Build.sh && \ - for D in \ - solenv \ - soltools \ - boost \ - external \ - cppunit \ - xml2cmp \ - lucene \ - sal \ - cosv \ - udm \ - autodoc \ - store \ - salhelper \ - registry \ - idlc \ - icu \ - codemaker \ - udkapi \ - expat \ - libxml2 \ - xml2cmp \ - libxslt \ - offapi \ - oovbaapi \ - cppu \ - cppuhelper \ - rdbmaker \ - cpputools \ - xmlreader \ - i18nutil \ - ridljar \ - jurt \ - jvmaccess \ - bridges \ - ucbhelper \ - comphelper \ - jvmfwk \ - regexp \ - berkeleydb \ - sax \ - stoc \ - i18npool \ - unodevtools \ - gettext \ - o3tl \ - basegfx \ - tools \ - idl \ - l10ntools \ - rsc \ - setup_native \ - icc \ - unoil \ - javaunohelper \ - unotools \ - xmlhelp \ - shell; do \ - if grep -q gb_Module_add_targets $$D/Module_$$D.mk 2>/dev/null; then \ - (cd $$D && make -sr -j@BUILD_MAX_JOBS@) || exit 1; \ - else \ - (cd $$D && build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@ && deliver.pl) || exit 1; \ - fi; \ - done + @. ./Env.Build.sh && \ + cd cross_toolset && \ + build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ && \ + touch $@ +else + touch $@ endif install: @@ -147,6 +80,7 @@ endif dmake/dmake@EXEEXT_FOR_BUILD@: ./bootstrap + -rm cross-build-toolset.built src.downloaded: ooo.lst download ifeq (@DO_FETCH_TARBALLS@,YES) |