[Libreoffice-commits] .: Branch 'feature/gnumake2.1' - solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/Helper.mk           |    4 ++++
 solenv/gbuild/platform/linux.mk   |    2 ++
 solenv/gbuild/platform/macosx.mk  |    2 ++
 solenv/gbuild/platform/windows.mk |    2 ++
 4 files changed, 10 insertions(+)

New commits:
commit 967a3da427384e1ba5262915e70e477cd0a69beb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 16 15:46:11 2011 -0600

    add helper to set-up the libraries env, to run executable during build

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 69015a1..b05f08b 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -154,4 +154,8 @@ gb_StaticLibrary_$(1) += $(2)
 
 endef
 
+define gb_Helper_execute
+$(call gb_Helper_set_ld_path) $(OUTDIR)/bin/$(1)
+endef
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index a6a85c9..82f8d17 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -137,6 +137,8 @@ endif
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
 # CObject class
 
 define gb_CObject__command
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 667fecf..fee4cef 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -135,6 +135,8 @@ endif
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
+gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
 
 # CObject class
 
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 2e4623f..898c9f7 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -201,6 +201,8 @@ $(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,O=$(gb_Helper_OUTDIR_NATIVE)) && \
 $(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1)))))))))
 endef
 
+gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
+
 # CObject class
 
 ifeq ($(gb_FULLDEPS),$(true))