[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - solenv/gbuild

[Michael Meeks]

 solenv/gbuild/platform/com_MSC_class.mk |    2 +-
 solenv/gbuild/platform/com_MSC_defs.mk  |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 00b61f6717442f494a03c13fd3580a92fdfe6d4d
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat May 24 17:21:39 2014 +0100

    Win32: fix cppunit test strangeness.
    
    Appending items to our search path for libraries leaves us vulnerable
    to similarly named libraries in the system. In my case some
    $HOME/AMD APP SDK/2.9/bin/x86/glew32.dll presumably incompatible
    with our internal version. Hence prepend important path elements to
    better match our program/ setup at run-time.
    
    Change-Id: Iecf266a9d14d71de6c2e402793339e579ec0b987

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
old mode 100644
new mode 100755
index fb617ac..60fb59e
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -364,7 +364,7 @@ endef
 # CppunitTest class
 
 gb_CppunitTest_DEFS := -D_DLL
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path):"$(shell cygpath -u $(gb_Library_DLLDIR)):$(shell cygpath -u $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll))"
+gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell cygpath -u $(gb_Library_DLLDIR)):$(shell cygpath -u $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll)))
 
 gb_CppunitTest_get_filename = test_$(1).dll
 gb_CppunitTest_get_ilibfilename = itest_$(1).lib
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
old mode 100644
new mode 100755
index 36c14e9..6e590b5
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -289,4 +289,8 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 
 gb_Helper_set_ld_path := PATH="$$PATH:$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR)/$(LIBO_BIN_FOLDER))"
 
+define gb_Helper_prepend_ld_path
+PATH="$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR)/$(LIBO_BIN_FOLDER)):$(1):$$PATH"
+endef
+
 # vim: set noet sw=4: