diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 08:59:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 08:59:02 +0000 |
| commit | 6cb661fba4a56782e521a4ede3db17d535f7cd4e (patch) | |
| tree | cda3bd87ac04acb347fbabad916519bd9516e238 /RepositoryExternal.mk | |
| parent | 8ae20343bba260073d4cee13118f507769fb0060 (diff) | |
Revert "Revert "build our own fontconfig and freetype under oss-fuzz""
This reverts commit d3c06fb90485543f6ca4b1f833e6c4f82b28ba14.
which seems innocent after all
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
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 |