[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 fc-cache/meson.build |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b368a0e38076bf72d5cc6473b81ecd095aa2c8ab
Author: James Lee <jbit at jbit.net>
Date:   Sat Oct 24 19:18:55 2020 +1100

    Fix 'meson install' when cross compiling
    
    Prevent execution of target's fc-cache on host when installing

diff --git a/fc-cache/meson.build b/fc-cache/meson.build
index 8963ac5..2222735 100644
--- a/fc-cache/meson.build
+++ b/fc-cache/meson.build
@@ -6,4 +6,8 @@ fccache = executable('fc-cache', ['fc-cache.c', fcstdint_h, alias_headers, ft_al
 )
 
 tools_man_pages += ['fc-cache']
-meson.add_install_script('../install-cache.py', fccache.full_path())
+
+# Do not try to execute target's fc-cache on host when cross compiling
+if not meson.is_cross_build()
+  meson.add_install_script('../install-cache.py', fccache.full_path())
+endif