diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-05-04 12:12:16 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-05-04 12:22:35 +0300 |
| commit | 25b5e3914d42f776ae0925a3d2bff3f159c07b00 (patch) | |
| tree | b9e0074b98e8c35784625b633fc7d18b269a2822 /external | |
| parent | ea374ab51e229bb1a959a271c1405ef72ad71316 (diff) | |
Use a dummy icu-config when cross-compiling harfbuzz (to Android)
Seems that when cross-compiling to Android from Linux, we apparently
have used either the build platform's pkg-config files for ICU, or the
build platform's icu-config. Both of which are obviously the wrong
thing to do, but apparently it has worked by accident anyway.
This makes building for Android on OS X proceed past harfbuzz, at least.
Change-Id: I27351f6177438697a1cded642c8c669ba7221009
Diffstat (limited to 'external')
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 1 | ||||
| -rwxr-xr-x | external/icu/cross-bin/icu-config | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index 5e59dcb8ff26..25141241c9dd 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -21,6 +21,7 @@ $(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) \ ./configure \ --enable-static \ --disable-shared \ diff --git a/external/icu/cross-bin/icu-config b/external/icu/cross-bin/icu-config new file mode 100755 index 000000000000..8ccf94f9bda6 --- /dev/null +++ b/external/icu/cross-bin/icu-config @@ -0,0 +1,12 @@ +#!/bin/sh + +case $1 in +--version) + echo whatever + ;; +--cppflags) + echo ${ICU_CFLAGS} + ;; +--ldflags-searchpath) + echo ${ICU_LIBS} +esac |