summaryrefslogtreecommitdiffstats
path: root/external/icu
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-12 20:27:41 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-12 20:34:49 +0300
commit4867d022d56e2f870f544a139a021e5afcb17312 (patch)
tree69e7caa2ecbed2324a725b6c5f2485d1b055823a /external/icu
parentAdd udata.cpp from ICU for easy breakpoint setting (diff)
downloadcore-4867d022d56e2f870f544a139a021e5afcb17312.tar.gz
core-4867d022d56e2f870f544a139a021e5afcb17312.zip
Don't create an icudata library for iOS
The intent being that the data file will be used instead. To avoid linking error, correspondingly include the ICU stubdata library in the list of static libraries to link with. Change-Id: I0f223fcce89dfbe283aaa2fcd2d5a58ea36ba364
Diffstat (limited to 'external/icu')
-rw-r--r--external/icu/ExternalProject_icu.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 78e57acb0f7d..445026060668 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -84,7 +84,9 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
--enable-static --disable-shared,\
--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
- --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source)\
+ --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
+ $(if $(filter IOS,$(OS)), \
+ --with-data-packaging=archive) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \