[Libreoffice-commits] core.git: external/firebird

[Caolán McNamara]

 external/firebird/ExternalProject_firebird.mk |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 6f069cc1b7b566886d47c65d2e70580eb15fafd8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 17 16:32:12 2016 +0100

    use preexisting helper to get DYLD_LIBRARY_PATH vs LD_LIBRARY_PATH
    
    plus line noise to extend the existing variable with another
    path if its already set
    
    Change-Id: I3e16a0a79da5d6c8c83fbad9c8d65abd9b7e2ca3
    Reviewed-on: https://gerrit.libreoffice.org/28196
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 6b3e689..c6fc7d4 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -74,12 +74,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 				-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \
 			) \
 		" \
-		$(if $(filter MACOSX,$(OS)), \
-		&& export DYLD_LIBRARY_PATH="$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \
-		)\
-		$(if $(filter-out WNT MACOSX IOS,$(OS)), \
-		&& export LD_LIBRARY_PATH="$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \
-		)\
+		export $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \
 		&& MAKE=$(MAKE) ./configure \
 			--without-editline \
 			--without-fbsample --without-fbsample-db \