From ef45930e5c2bb0129c4af63e2c912db676f18384 Mon Sep 17 00:00:00 2001 From: "Andrzej J.R. Hunt" Date: Wed, 10 Jul 2013 12:30:45 +0100 Subject: Modify DYLD_LIBRARY_PATH for firebrid to build on Mac OS. Change-Id: Iae45d39a9a1ce76b0af74c317c5990b3674a7ca6 Reviewed-on: https://gerrit.libreoffice.org/4806 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba --- firebird/ExternalProject_firebird.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk index 8853ecadb1a6..aa4c5970590f 100644 --- a/firebird/ExternalProject_firebird.mk +++ b/firebird/ExternalProject_firebird.mk @@ -43,7 +43,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -L$(OUTDIR)/lib \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \ && export LD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \ - && export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)" \ + && export DYLD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \ + $(if $(filter WNT,$(OS)),&& export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)") \ && ./configure \ --without-editline \ --disable-superserver \ -- cgit v1.2.3