diff options
| author | Matthias Klumpp <matthias@tenstral.net> | 2017-08-29 01:53:22 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-29 18:38:51 +0300 |
| commit | 5275548b5ceb7b2c1a58854fd7a9162fbac99ca9 (patch) | |
| tree | d0de87d30464c792c7e9c0d67cafad820e57a2ac | |
| parent | d49eeb243f49d57e6c69ff61354556897fbe8ed5 (diff) | |
| download | meson-5275548b5ceb7b2c1a58854fd7a9162fbac99ca9.zip meson-5275548b5ceb7b2c1a58854fd7a9162fbac99ca9.tar.gz meson-5275548b5ceb7b2c1a58854fd7a9162fbac99ca9.tar.bz2 | |
gnome: Ensure gir always works with asan, even if used together with ubsan
This really resolves #1910 by making it also work in cases where asan
and ubsan are used together via "-Db_sanitize=address,undefined".
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index ababb8c..37ba453 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -486,7 +486,7 @@ class GnomeModule(ExtensionModule): if 'b_sanitize' in compiler.base_options: sanitize = state.environment.coredata.base_options['b_sanitize'].value cflags += compilers.sanitizer_compile_args(sanitize) - if sanitize == 'address': + if 'address' in sanitize.split(','): ldflags += ['-lasan'] # FIXME: Linking directly to libasan is not recommended but g-ir-scanner # does not understand -f LDFLAGS. https://bugzilla.gnome.org/show_bug.cgi?id=783892 |