diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-05-24 17:21:39 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-05-24 20:06:07 +0100 |
| commit | a7653da3317c4e1a52f6152f42d3d9fe3170918e (patch) | |
| tree | a48c9a4449f409416b18954a72c4e91a410a58d0 /solenv | |
| parent | 02638a0865271959e7a424622088eb502721e24c (diff) | |
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
Diffstat (limited to 'solenv')
| -rwxr-xr-x[-rw-r--r--] | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | solenv/gbuild/platform/com_MSC_defs.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index fb617ac9e85b..60fb59e38016 100644..100755 --- 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 index 36c14e91e9ef..6e590b58aad1 100644..100755 --- 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: |