aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Griffis <tingping@tingping.se>2016-10-17 18:41:00 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2016-10-22 15:04:16 -0700
commited3cc537cb34b6ab054a67d86a5c96258e7650d2 (patch)
treec80ff2885463418e8f0a7cd4f809f2305b54380e
parent885a3c706fbabc7453aa5a32828d0a6eaee080eb (diff)
downloadmeson-ed3cc537cb34b6ab054a67d86a5c96258e7650d2.zip
meson-ed3cc537cb34b6ab054a67d86a5c96258e7650d2.tar.gz
meson-ed3cc537cb34b6ab054a67d86a5c96258e7650d2.tar.bz2
gnome: Fix building gobject-introspection with sanitizer
Fixes #922
-rw-r--r--mesonbuild/modules/gnome.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index ea9b15a..bb6abd4 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -343,9 +343,18 @@ class GnomeModule:
else:
raise MesonException(
'Gir includes must be str, GirTarget, or list of them')
+
+ cflags = []
if state.global_args.get('c'):
+ cflags += state.global_args['c']
+ for compiler in state.compilers:
+ if compiler.get_language() == 'c':
+ sanitize = compiler.get_options().get('b_sanitize')
+ if sanitize:
+ cflags += compilers.sanitizer_compile_args(sanitize)
+ if cflags:
scan_command += ['--cflags-begin']
- scan_command += state.global_args['c']
+ scan_command += cflags
scan_command += ['--cflags-end']
if kwargs.get('symbol_prefix'):
sym_prefix = kwargs.pop('symbol_prefix')