From: zuul <zuul@gerrit.asterisk.org>
Date: Wed, 10 Feb 2016 20:32:07 +0000 (-0600)
Subject: Merge "Build: Fix menuselect USAN conflicts" into 11
X-Git-Tag: 11.22.0-rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fddd8a8ef07bf7a833bf6be1bcbbb37e3ab8c2f9;p=thirdparty%2Fasterisk.git

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

fddd8a8ef07bf7a833bf6be1bcbbb37e3ab8c2f9
diff --cc build_tools/cflags.xml
index 0b8852b16a,5e06ed96bc..1ebbeb9784
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@@ -76,22 -73,15 +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>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>