diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-17 16:32:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-18 07:22:14 +0000 |
| commit | 6f069cc1b7b566886d47c65d2e70580eb15fafd8 (patch) | |
| tree | 7857f23c696058fe2e104d8f79845ec933837c90 /external/firebird | |
| parent | 223c2258368e113beb7f5e6f2508dae7b394e26d (diff) | |
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@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/firebird')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 7 |
1 files changed, 1 insertions, 6 deletions
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 \ |