Merge "Build: Fix menuselect USAN conflicts"
authorJoshua Colp <jcolp@digium.com>
Wed, 10 Feb 2016 20:34:51 +0000 (14:34 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 10 Feb 2016 20:34:51 +0000 (14:34 -0600)
1  2 
build_tools/cflags.xml

                        <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>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>