kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Build: Fix menuselect USAN conflicts" into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-02-10 15:39:53 -06:00
committed by Gerrit Code Review
parent bd07b6f0dd e9e896abd1
commit 0e25e4a924
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_tools/cflags.xml
View File

@@ -89,7 +89,6 @@
<support_level>extended</support_level> <support_level>extended</support_level>
<conflict>THREAD_SANITIZER</conflict> <conflict>THREAD_SANITIZER</conflict>
<conflict>LEAK_SANITIZER</conflict> <conflict>LEAK_SANITIZER</conflict>
<conflict>UNDEFINED_SANITIZER</conflict>
<conflict>MALLOC_DEBUG</conflict> <conflict>MALLOC_DEBUG</conflict>
<conflict>DEBUG_CHAOS</conflict> <conflict>DEBUG_CHAOS</conflict>
</member> </member>
@@ -98,23 +97,18 @@
<support_level>extended</support_level> <support_level>extended</support_level>
<conflict>ADDRESS_SANITIZER</conflict> <conflict>ADDRESS_SANITIZER</conflict>
<conflict>LEAK_SANITIZER</conflict> <conflict>LEAK_SANITIZER</conflict>
<conflict>UNDEFINED_SANITIZER</conflict>
</member> </member>
<member name="LEAK_SANITIZER" displayname="Leak Sanitizer"> <member name="LEAK_SANITIZER" displayname="Leak Sanitizer">
<depend>HAVE_LEAK_SANITIZER</depend> <depend>HAVE_LEAK_SANITIZER</depend>
<support_level>extended</support_level> <support_level>extended</support_level>
<conflict>ADDRESS_SANITIZER</conflict> <conflict>ADDRESS_SANITIZER</conflict>
<conflict>THREAD_SANITIZER</conflict> <conflict>THREAD_SANITIZER</conflict>
<conflict>UNDEFINED_SANITIZER</conflict>
<conflict>MALLOC_DEBUG</conflict> <conflict>MALLOC_DEBUG</conflict>
<conflict>DEBUG_CHAOS</conflict> <conflict>DEBUG_CHAOS</conflict>
</member> </member>
<member name="UNDEFINED_SANITIZER" displayname="Undefined Behavior Sanitizer"> <member name="UNDEFINED_SANITIZER" displayname="Undefined Behavior Sanitizer">
<depend>HAVE_UNDEFINED_SANITIZER</depend> <depend>HAVE_UNDEFINED_SANITIZER</depend>
<support_level>extended</support_level> <support_level>extended</support_level>
<conflict>ADDRESS_SANITIZER</conflict>
<conflict>THREAD_SANITIZER</conflict>
<conflict>LEAK_SANITIZER</conflict>
</member> </member>
<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part"> <member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict> <conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>