diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-05-13 14:39:21 -0700 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-07-23 09:58:24 +0000 |
| commit | c8a6a44850485b61eca520f0153f5532f871db5e (patch) | |
| tree | 9dddd0289113fce8299c3026da1994288fab9c57 /mesonbuild/modules | |
| parent | e0f036f3a4806c298961a61ccc8e7e38ab4b4587 (diff) | |
| download | meson-c8a6a44850485b61eca520f0153f5532f871db5e.zip meson-c8a6a44850485b61eca520f0153f5532f871db5e.tar.gz meson-c8a6a44850485b61eca520f0153f5532f871db5e.tar.bz2 | |
compilers: pull sanitzier args into compiler classes
This simplifies and cleans things up.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index f67c7c2..1ee98cc 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -23,7 +23,6 @@ import subprocess from .. import build from .. import mlog from .. import mesonlib -from .. import compilers from .. import interpreter from . import GResourceTarget, GResourceHeaderTarget, GirTarget, TypelibTarget, VapiTarget from . import get_include_args @@ -604,7 +603,7 @@ class GnomeModule(ExtensionModule): cflags += state.project_args[lang] if 'b_sanitize' in compiler.base_options: sanitize = state.environment.coredata.base_options['b_sanitize'].value - cflags += compilers.sanitizer_compile_args(sanitize) + cflags += compiler.sanitizer_compile_args(sanitize) sanitize = sanitize.split(',') # These must be first in ldflags if 'address' in sanitize: @@ -615,7 +614,7 @@ class GnomeModule(ExtensionModule): internal_ldflags += ['-lubsan'] # FIXME: Linking directly to lib*san is not recommended but g-ir-scanner # does not understand -f LDFLAGS. https://bugzilla.gnome.org/show_bug.cgi?id=783892 - # ldflags += compilers.sanitizer_link_args(sanitize) + # ldflags += compiler.sanitizer_link_args(sanitize) return cflags, internal_ldflags, external_ldflags |