diff options
| author | GabrĂel ArthĂșr PĂ©tursson <gabriel@system.is> | 2017-07-02 21:11:17 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-15 09:59:09 +0200 |
| commit | 39c7b0492c078a159def3e11443b8f7174eeca2e (patch) | |
| tree | 713e486bfb6c86d8c7c5d9b89229a3b20bf7d8ec | |
| parent | d9939f00640a5fce01f7ddeab4726b8a9ff43e80 (diff) | |
| download | meson-39c7b0492c078a159def3e11443b8f7174eeca2e.zip meson-39c7b0492c078a159def3e11443b8f7174eeca2e.tar.gz meson-39c7b0492c078a159def3e11443b8f7174eeca2e.tar.bz2 | |
Allow both address- and undefined behavior sanitizers at the same time
| -rw-r--r-- | docs/markdown/Release-notes-for-0.42.0.md | 5 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/markdown/Release-notes-for-0.42.0.md b/docs/markdown/Release-notes-for-0.42.0.md index d6d5365..fe4af75 100644 --- a/docs/markdown/Release-notes-for-0.42.0.md +++ b/docs/markdown/Release-notes-for-0.42.0.md @@ -46,3 +46,8 @@ are `dylib` or `cdylib` for shared libraries, and `rlib` or Rust's [linkage reference][rust-linkage]. [rust-linkage]: https://doc.rust-lang.org/reference/linkage.html + +## Simultaneous use of Address- and Undefined Behavior Sanitizers + +Both the address- and undefined behavior sanitizers can now be used +simultaneously by passing `-Db_sanitize=address,undefined` to Meson. diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 6b5c4a4..9007cc5 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -207,7 +207,7 @@ base_options = {'b_pch': coredata.UserBooleanOption('b_pch', 'Use precompiled he 'b_lto': coredata.UserBooleanOption('b_lto', 'Use link time optimization', False), 'b_sanitize': coredata.UserComboOption('b_sanitize', 'Code sanitizer to use', - ['none', 'address', 'thread', 'undefined', 'memory'], + ['none', 'address', 'thread', 'undefined', 'memory', 'address,undefined'], 'none'), 'b_lundef': coredata.UserBooleanOption('b_lundef', 'Use -Wl,--no-undefined when linking', True), 'b_asneeded': coredata.UserBooleanOption('b_asneeded', 'Use -Wl,--as-needed when linking', True), |