diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-02-10 15:39:53 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-02-10 15:39:53 -0600 |
| commit | 0e25e4a924b252014694b7218630995ab1733f16 (patch) | |
| tree | b4b3cda2988edc4504bfdfb3df601d8a20824cb7 /build_tools | |
| parent | bd07b6f0dd3f4e490d0c2f0d81d045a977c03eca (diff) | |
| parent | e9e896abd1f1abae526319fdfd474ae1c28fed52 (diff) | |
Merge "Build: Fix menuselect USAN conflicts" into 13
Diffstat (limited to 'build_tools')
| -rw-r--r-- | build_tools/cflags.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index a43daa0ae..ea741531a 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -89,7 +89,6 @@ <support_level>extended</support_level> <conflict>THREAD_SANITIZER</conflict> <conflict>LEAK_SANITIZER</conflict> - <conflict>UNDEFINED_SANITIZER</conflict> <conflict>MALLOC_DEBUG</conflict> <conflict>DEBUG_CHAOS</conflict> </member> @@ -98,23 +97,18 @@ <support_level>extended</support_level> <conflict>ADDRESS_SANITIZER</conflict> <conflict>LEAK_SANITIZER</conflict> - <conflict>UNDEFINED_SANITIZER</conflict> </member> <member name="LEAK_SANITIZER" displayname="Leak Sanitizer"> <depend>HAVE_LEAK_SANITIZER</depend> <support_level>extended</support_level> <conflict>ADDRESS_SANITIZER</conflict> <conflict>THREAD_SANITIZER</conflict> - <conflict>UNDEFINED_SANITIZER</conflict> <conflict>MALLOC_DEBUG</conflict> <conflict>DEBUG_CHAOS</conflict> </member> <member name="UNDEFINED_SANITIZER" displayname="Undefined Behavior Sanitizer"> <depend>HAVE_UNDEFINED_SANITIZER</depend> <support_level>extended</support_level> - <conflict>ADDRESS_SANITIZER</conflict> - <conflict>THREAD_SANITIZER</conflict> - <conflict>LEAK_SANITIZER</conflict> </member> <member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part"> <conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict> |