summaryrefslogtreecommitdiff
path: root/external/fontconfig
diff options
context:
space:
mode:
Diffstat (limited to 'external/fontconfig')
-rw-r--r--external/fontconfig/ExternalProject_fontconfig.mk2
-rw-r--r--external/fontconfig/Module_fontconfig.mk4
2 files changed, 1 insertions, 5 deletions
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
index e4de004bdc34..83387e31e7ef 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \
./configure \
--disable-shared \
- --with-arch=arm \
+ $(if $(filter ANDROID,$(OS)),--with-arch=arm) \
--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
--with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
diff --git a/external/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk
index 764af35cdb6e..e755f8610db1 100644
--- a/external/fontconfig/Module_fontconfig.mk
+++ b/external/fontconfig/Module_fontconfig.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,fontconfig))
-ifeq ($(OS),ANDROID)
-
$(eval $(call gb_Module_add_targets,fontconfig,\
ExternalProject_fontconfig \
UnpackedTarball_fontconfig \
))
-endif
-
# vim: set noet sw=4 ts=4: