summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-03-21 16:41:40 +0530
committerMatthias Clasen <mclasen@redhat.com>2017-07-13 19:03:39 -0400
commit2f792f64848307d6662e7b2f026c1c8ea1fc9437 (patch)
treea507d77f4e20d1045ea3f2994b3c351c4ca43e60
parent88e437873ad1444e6f93b8c47145b1c9eea9c592 (diff)
downloadglib-2f792f64848307d6662e7b2f026c1c8ea1fc9437.tar.gz
meson: Print output for more compiler checks
When no 'name:' kwarg is specified for cc.run, no output is printed. This makes it difficult to figure out what is causing a pause in the configure process.
-rw-r--r--meson.build14
1 files changed, 7 insertions, 7 deletions
diff --git a/meson.build b/meson.build
index 5ee927c16..c8dbe99fb 100644
--- a/meson.build
+++ b/meson.build
@@ -1104,12 +1104,12 @@ else
error('FIX POLL* defines')
endif
-value_POLLIN = cc.run(templ.format('POLLIN')).stdout().strip()
-value_POLLOUT = cc.run(templ.format('POLLOUT')).stdout().strip()
-value_POLLPRI = cc.run(templ.format('POLLPRI')).stdout().strip()
-value_POLLERR = cc.run(templ.format('POLLERR')).stdout().strip()
-value_POLLHUP = cc.run(templ.format('POLLHUP')).stdout().strip()
-value_POLLNVAL = cc.run(templ.format('POLLNVAL')).stdout().strip()
+value_POLLIN = cc.run(templ.format('POLLIN'), name : 'POLLIN value').stdout().strip()
+value_POLLOUT = cc.run(templ.format('POLLOUT'), name : 'POLLOUT value').stdout().strip()
+value_POLLPRI = cc.run(templ.format('POLLPRI'), name : 'POLLPRI value').stdout().strip()
+value_POLLERR = cc.run(templ.format('POLLERR'), name : 'POLLERR value').stdout().strip()
+value_POLLHUP = cc.run(templ.format('POLLHUP'), name : 'POLLHUP value').stdout().strip()
+value_POLLNVAL = cc.run(templ.format('POLLNVAL'), name : 'POLLNVAL value').stdout().strip()
glibconfig_conf.set('g_pollin', value_POLLIN)
glibconfig_conf.set('g_pollout', value_POLLOUT)
@@ -1150,7 +1150,7 @@ int main(int argc, char **argv) {
if not meson.has_exe_wrapper()
error('Fix sys define detection for cross build')
endif
- val = cc.run(templ.format(glib_inet_includes, d[0])).stdout().strip()
+ val = cc.run(templ.format(glib_inet_includes, d[0]), name : d[0] + ' value').stdout().strip()
glibconfig_conf.set(d[1], val)
endforeach