From: Badalyan Vyacheslav <v.badalyan@open-bs.ru>
Date: Wed, 10 Feb 2016 02:57:38 +0000 (+0000)
Subject: Build: Fix menuselect USAN conflicts
X-Git-Tag: 13.8.0-rc1~79^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9e896abd1f1abae526319fdfd474ae1c28fed52;p=thirdparty%2Fasterisk.git

Build: Fix menuselect USAN conflicts

USAN can be used together with other sanitizers.

Reported by: Badalyan Vyacheslav
Tested by: Badalyan Vyacheslav

Change-Id: I3bffa350d70965c3026651dba3a12414d0aaa45f
---

diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index d11fb22e52..54e8ba7505 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -88,7 +88,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>
@@ -96,21 +95,16 @@
 			<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">
 			<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">
 			<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>