summaryrefslogtreecommitdiff
path: root/gmodule
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2022-11-01 23:36:04 +0000
committerXavier Claessens <xclaesse@gmail.com>2022-11-01 23:36:04 +0000
commitf6edb52bda91e83543d7d6327d0b70f6fbbb5225 (patch)
treedf29e42437a73c5da4c6259f3aa97a95ca28ac84 /gmodule
parent993325400d323e05e07308ba78695e03beca8771 (diff)
parentbd2cb39073f34a25e0afeb3aef935ee4ad1bd10b (diff)
downloadglib-f6edb52bda91e83543d7d6327d0b70f6fbbb5225.tar.gz
Merge branch 'wip/3v1n0/some-meson-fixmes' into 'main'
meson: Handle various build system FIXME's See merge request GNOME/glib!3012
Diffstat (limited to 'gmodule')
-rw-r--r--gmodule/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/gmodule/meson.build b/gmodule/meson.build
index 7713a975d..5119e0be0 100644
--- a/gmodule/meson.build
+++ b/gmodule/meson.build
@@ -28,11 +28,11 @@ if g_module_impl == 'G_MODULE_IMPL_DL'
message('Building for MSVC: assuming that symbols are prefixed with underscore')
g_module_need_uscore = 1
elif meson.can_run_host_binaries()
- # FIXME: communicate result via stdout instead of return value, so non-0 return is not printed in bold red
rres = cc.run(dlopen_dlsym_test_code,
dependencies : libdl_dep,
name : 'dlsym() preceding underscores')
- if host_system == 'windows' or (rres.compiled() and rres.returncode() == 0)
+ if host_system == 'windows' or (rres.compiled() and
+ rres.returncode() == 0 and rres.stdout().to_int() == 0)
g_module_need_uscore = 1
endif
else