[Libreoffice-commits] .: 3 commits - Makefile.in solenv/gbuild solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Jun 21 05:22:55 PDT 2011
Makefile.in | 4 +++-
solenv/gbuild/platform/winmingw.mk | 2 +-
solenv/inc/settings.mk | 7 +++++++
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 5ab80c543e2a4679d019cb1ef88bb175d4fdbfc9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 15:21:18 2011 +0300
Set LD/DYLD_LIBRARY_PATH when running rsc
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index fe8cfc2..ccfc092 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -645,7 +645,7 @@ gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
# SrsPartTarget class
gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
+gb_SrsPartTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
ifeq ($(gb_FULLDEPS),$(true))
define gb_SrsPartTarget__command_dep
commit 76082f6c94a7880570c7750d5f41388d1e539433
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 02:49:25 2011 +0300
Add EXECPOST_FOR_BUILD
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 44b1ff7..04c9fee 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1005,6 +1005,13 @@ LNTFLAGSOUTOBJ=-os
DLLPOSTFIX=lo
+.IF "$(CROSS_COMPILING)" == "YES"
+# Assume always cross-compiling from Unix
+EXECPOST_FOR_BUILD=
+.ELSE
+EXECPOST_FOR_BUILD=$(EXECPOST)
+.ENDIF
+
.IF "$(OOO_LIBRARY_PATH_VAR)" != ""
# Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
# path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from
commit 2a857a5893efe11108c23ee648efcfac4d8d65b7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 02:49:02 2011 +0300
Add unoil and javaunohelper to cross-build-toolset, sigh
diff --git a/Makefile.in b/Makefile.in
index 24e3a9d..9cb6355 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,7 +77,9 @@ cross-build-toolset:
l10ntools \
rsc \
setup_native \
- icc; do \
+ icc \
+ unoil \
+ javaunohelper; do \
if grep -q gb_Module_add_targets $$D/Module_$$D.mk 2>/dev/null; then \
(cd $$D && make -sr -j at BUILD_MAX_JOBS@) \
else \
More information about the Libreoffice-commits
mailing list