kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-04 22:07:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Build: Fix menuselect USAN conflicts" into 11

Browse Source
This commit is contained in:
zuul
2016-02-10 14:32:07 -06:00
committed by Gerrit Code Review
parent 3fdeb5a140 598685f8a5
commit fddd8a8ef0
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_tools/cflags.xml
-6
View File
@@ -68,7 +68,6 @@
<support_level>extended</support_level>
<conflict>THREAD_SANITIZER</conflict>
<conflict>LEAK_SANITIZER</conflict>
<conflict>UNDEFINED_SANITIZER</conflict>
<conflict>MALLOC_DEBUG</conflict>
</member>
<member name="THREAD_SANITIZER" displayname="Thread Sanitizer">
@@ -76,22 +75,17 @@
<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>
</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>