diff options
author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-10 12:30:45 +0100 |
---|---|---|
committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-11 05:09:31 +0000 |
commit | ef45930e5c2bb0129c4af63e2c912db676f18384 (patch) | |
tree | 58ad5e4c4c8f5e96c2d193aa0733d3855c9ba7fc | |
parent | 2c3eeb2f63a9e7898da4b145c51d451fcb039961 (diff) |
Modify DYLD_LIBRARY_PATH for firebrid to build on Mac OS.
feature/firebird-sdbc
Change-Id: Iae45d39a9a1ce76b0af74c317c5990b3674a7ca6
Reviewed-on: https://gerrit.libreoffice.org/4806
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r-- | firebird/ExternalProject_firebird.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 \ |