From 9364a49a87684e54b7b04a6a110a2325bff5d96b Mon Sep 17 00:00:00 2001 From: Akash Jain Date: Mon, 23 May 2016 18:52:56 +0530 Subject: Add option to enable HarfBuzz support independent of platform Make HarfBuzz compile on any platform using the --with-harfbuzz option. Support is experimental only. Change-Id: I84fb80f3f8abed8ac877a294cf7ef39cf4cb2e9e Reviewed-on: https://gerrit.libreoffice.org/25369 Reviewed-by: Khaled Hosny Tested-by: Khaled Hosny --- external/harfbuzz/ExternalProject_harfbuzz.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'external/harfbuzz') diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index c287a22e0c6b..9e01833261e6 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -21,7 +21,8 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(call gb_ExternalProject_run,build,\ - $(if $(CROSS_COMPILING),PATH=$(SRCDIR)/external/icu/cross-bin:$$PATH) \ + $(if $(CROSS_COMPILING),ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \ + $(if $(SYSTEM_ICU),,ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \ ./configure \ --enable-static \ --disable-shared \ -- cgit v1.2.3