diff options
| -rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 3cc8ba15cc33..deb62a834a36 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -52,6 +52,14 @@ $(eval $(call gb_StaticLibrary_add_defs,plugcon,\ )) $(eval $(call gb_StaticLibrary_use_external,plugcon,gtk)) + +# Gtk uses cairo, and if we build internal cairo, the linker could +# pick up our cairo libs before they're fully ready, causing problems +# (e.g. using our libpixman and system libcairo). Depend on cairo +# to delay build until cairo is done. +ifeq ($(SYSTEM_CAIRO),NO) +$(eval $(call gb_StaticLibrary_use_external,plugcon,cairo)) +endif endif # ENABLE_GTK=TRUE $(eval $(call gb_StaticLibrary_add_exception_objects,plugcon,\ |