diff options
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | RepositoryExternal.mk | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 69ea9f00c99e..b1bf955c23ca 100644 --- a/Repository.mk +++ b/Repository.mk @@ -141,7 +141,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ test \ fileacc \ - icui18n \ )) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 791c5d576702..a4d29a86fe35 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -317,6 +317,9 @@ endif # SYSTEM_GRAPHITE ifeq ($(SYSTEM_ICU),YES) +define gb_LinkTarget__use_icui18n +$(call gb_LinkTarget_add_libs,$(1),-licui18n) +endef define gb_LinkTarget__use_icule $(call gb_LinkTarget_add_libs,$(1),-licule) endef @@ -327,10 +330,16 @@ endef else # !SYSTEM_ICU $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + icui18n \ icule \ icuuc \ )) +define gb_LinkTarget__use_icui18n +$(call gb_LinkTarget_add_linked_libs,$(1),\ + icui18n \ +) +endef define gb_LinkTarget__use_icule $(call gb_LinkTarget_add_linked_libs,$(1),\ icule \ |