summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-13 16:30:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-15 09:28:03 +0000
commitf2fae3684f35bfb03c4921adc4ecbddcff36374b (patch)
tree8bebff39b8b346fa246b37f549e5152eaa842dae /RepositoryExternal.mk
parent7f9a389b45e2452d859e17cf51acd27dc7355af6 (diff)
build our own fontconfig and freetype under oss-fuzz
Change-Id: I7141aabd64c3f42545176fa8c907d8326e25e9ff
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dcc47a68c47a..3d5c5aa10c88 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1273,7 +1273,7 @@ endef
gb_ExternalProject__use_freetype :=
-else ifeq ($(OS),ANDROID)
+else
define gb_LinkTarget__use_freetype_headers
$(call gb_LinkTarget_use_external_project,$(1),freetype)
@@ -1286,7 +1286,7 @@ endef
define gb_LinkTarget__use_freetype
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),-lfreetype)
endef
@@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
endef
-else ifeq ($(OS),ANDROID)
+else
define gb_LinkTarget__use_fontconfig
$(call gb_LinkTarget_use_external_project,$(1),fontconfig)
@@ -1318,6 +1318,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
+$(call gb_LinkTarget_add_libs,$(1),-lfontconfig)
+
endef
endif # SYSTEM_FONTCONFIG