diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 14:25:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 15:48:53 +0200 |
| commit | 8a3ea757c35a000ea303a11b36692aebc2400ead (patch) | |
| tree | 4712f03edc94684407ad2acc2345e6ee4081066d /RepositoryExternal.mk | |
| parent | 6af8887b41a8438d29b4743f238be7330516ecbc (diff) | |
Use --with-library-suffix=lo for Android to avoid clash with system ICU
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d7ff86f4b674..11deeaaff838 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -384,6 +384,12 @@ endef else # !SYSTEM_ICU +ifeq ($(OS),ANDROID) +gb_ICU_suffix:=lo +else +gb_ICU_suffix:= +endif + # icudata and icui18n is called icudt and icuin when built with MSVC :-( ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ @@ -408,22 +414,22 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ endef else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icudata \ - icui18n \ - icule \ - icutu \ - icuuc \ + icudata$(gb_ICU_suffix) \ + icui18n$(gb_ICU_suffix) \ + icule$(gb_ICU_suffix) \ + icutu$(gb_ICU_suffix) \ + icuuc$(gb_ICU_suffix) \ )) define gb_LinkTarget__use_icudata $(call gb_LinkTarget_add_linked_libs,$(1),\ - icudata \ + icudata$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icui18n $(call gb_LinkTarget_add_linked_libs,$(1),\ - icui18n \ + icui18n$(gb_ICU_suffix) \ ) endef @@ -431,19 +437,19 @@ endif define gb_LinkTarget__use_icule $(call gb_LinkTarget_add_linked_libs,$(1),\ - icule \ + icule$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icutu $(call gb_LinkTarget_add_linked_libs,$(1),\ - icutu \ + icutu$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_add_linked_libs,$(1),\ - icuuc \ + icuuc$(gb_ICU_suffix) \ ) endef |