From 3ed5847c3e9a6dfee5bb5b7f228822fc1431a54c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 23 Sep 2016 10:58:54 +0200 Subject: [PATCH] external/firebird: Use gb_Helper_extend_ld_path to add icu dir Change-Id: If51813fc559a78a54ae5dcae4b8b9213c5e1bae6 Reviewed-on: https://gerrit.libreoffice.org/29215 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- external/firebird/ExternalProject_firebird.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 09c4463f2f4c..c943053014d1 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -26,9 +26,7 @@ ifneq ($(OS),WNT) INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}" endif -MAKE_PRE=$(if $(filter WNT,$(OS)),\ - PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\ - $(gb_Helper_set_ld_path)) +MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib) MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ @@ -75,7 +73,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -L$(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 \ --with-wire-compress=no \