From: Joshua Colp <jcolp@digium.com>
Date: Wed, 10 Feb 2016 20:34:51 +0000 (-0600)
Subject: Merge "Build: Fix menuselect USAN conflicts"
X-Git-Tag: 14.0.0-beta1~402
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b3d64234eb1c012f092a4407d318427977c1a0a;p=thirdparty%2Fasterisk.git

Merge "Build: Fix menuselect USAN conflicts"
---

3b3d64234eb1c012f092a4407d318427977c1a0a
diff --cc build_tools/cflags.xml
index 763f07eeff,557ea39c84..566c3b08f2
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@@ -98,10 -95,8 +97,9 @@@
  			<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>
@@@ -110,11 -104,7 +107,8 @@@
  			<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>