From 6f069cc1b7b566886d47c65d2e70580eb15fafd8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 17 Aug 2016 16:32:12 +0100 Subject: use preexisting helper to get DYLD_LIBRARY_PATH vs LD_LIBRARY_PATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- external/firebird/ExternalProject_firebird.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'external/firebird') diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 6b3e6894853e..c6fc7d41250d 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 \ -- cgit