[Libreoffice-commits] .: 2 commits - Makefile.in solenv/gbuild

[Tor Lillqvist]

 Makefile.in                      |    3 ++-
 solenv/gbuild/platform/unxgcc.mk |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c029a179fb8a6534ef35652d7ef12b2764537063
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 12 14:53:44 2011 +0300

    Run rsc and rscpp from the bin directory for the build platform

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7d79167..c93c6d1 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -414,7 +414,7 @@ gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/l
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(OUTDIR_FOR_BUILD)/bin/rsc
 
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs,\
commit a27b6caf7ee43f347a09286aa427059729d63ec2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 12 14:53:00 2011 +0300

    Add "rsc" to cross-build-toolset

diff --git a/Makefile.in b/Makefile.in
index 83848ed..0d70a9f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,7 +69,8 @@ cross-build-toolset:
 	  dictionaries \
 	  o3tl \
 	  basegfx \
-	  tools; do \
+	  tools \
+	  rsc; do \
 	    (cd $$D && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl); \
 	done; \
 	for D in \