[gdk-pixbuf: 3/5] meson: Don't generate the loader cache when cross-compiling
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf: 3/5] meson: Don't generate the loader cache when cross-compiling
- Date: Tue, 4 Dec 2018 20:42:28 +0000 (UTC)
commit 475cb37ffd969cd4d912fac35e36644a0ee37986
Author: Matthew Waters <matthew centricular com>
Date: Mon Oct 8 21:04:49 2018 +1100
meson: Don't generate the loader cache when cross-compiling
gdk-pixbuf/meson.build | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 166d23140..41323b2d4 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -305,18 +305,23 @@ foreach bin: gdkpixbuf_bin
set_variable(bin_name.underscorify(), bin)
endforeach
-# The 'loaders.cache' used for testing, so we don't accidentally
-# load the installed cache; we always build it by default
-loaders_cache = custom_target('loaders.cache',
- output: 'loaders.cache',
- capture: true,
- command: [
- gdk_pixbuf_query_loaders,
- dynamic_loaders,
- ],
- depends: dynamic_loaders_dep,
- build_by_default: true)
-loaders_dep = declare_dependency(sources: [ loaders_cache ])
+if not meson.is_cross_build()
+ # The 'loaders.cache' used for testing, so we don't accidentally
+ # load the installed cache; we always build it by default
+ loaders_cache = custom_target('loaders.cache',
+ output: 'loaders.cache',
+ capture: true,
+ command: [
+ gdk_pixbuf_query_loaders,
+ dynamic_loaders,
+ ],
+ depends: dynamic_loaders_dep,
+ build_by_default: true)
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
+else
+ loaders_cache = []
+ loaders_dep = declare_dependency()
+endif
pkgconfig = import('pkgconfig')
pkgconfig.generate(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]