summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-06-01 18:53:40 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2021-06-01 22:08:09 +0200
commit017bc462b0af467ca89653266674302a9821db5e (patch)
tree34eab3f1f411637268d5956795d5ddc84bd161f0 /RepositoryExternal.mk
parentxmlsec: rename xmlsignaturehelper2 files (diff)
downloadcore-017bc462b0af467ca89653266674302a9821db5e.tar.gz
core-017bc462b0af467ca89653266674302a9821db5e.zip
cairo: Drop config for WNT and MACOSX build
It's not used on these platforms since a long time. Change-Id: Idac41f1be0a546fd8aa0dd88709ebfa3255a104e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116555 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 688bef98ac1a..2c1bf9c7d79f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1291,7 +1291,7 @@ else # !SYSTEM_CAIRO
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
cairo \
- $(if $(filter $(OS),WNT),,pixman) \
+ pixman \
))
define gb_LinkTarget__use_cairo
@@ -1306,9 +1306,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
- $(if $(filter-out MACOSX WNT,$(OS)), \
-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
- ) \
)
endef