Drive the python3 DLL entry point from EnableASAN only

Author: ck0i

PCbuild/pyproject.props

@@ -25,14 +25,6 @@
     <SupportSigning Condition="'$(Configuration)' == 'Debug'">false</SupportSigning>
     <SupportSigning Condition="'$(ConfigurationType)' == 'StaticLibrary'">false</SupportSigning>
     <LinkIncremental Condition="$(Configuration) != 'Debug'">false</LinkIncremental>
-
-    <!--
-    AddressSanitizer may be enabled with the EnableASAN property or through the
-    _CL_ and _LINK_ environment variables, so check all of them.
-    -->
-    <PyUsingAsan Condition="'$(PyUsingAsan)' == '' and '$(EnableASAN)' == 'true'">true</PyUsingAsan>
-    <PyUsingAsan Condition="'$(PyUsingAsan)' == '' and $(_CL_.ToLowerInvariant().Contains('fsanitize=address'))">true</PyUsingAsan>
-    <PyUsingAsan Condition="'$(PyUsingAsan)' == '' and $(_LINK_.ToLowerInvariant().Contains('inferasanlibs'))">true</PyUsingAsan>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(TargetExt) != ''">

PCbuild/python3dll.vcxproj

@@ -99,7 +99,7 @@
       The ASan runtime thunks need the CRT to be initialized, so keep the
       default entry point when building with AddressSanitizer.
       -->
-      <NoEntryPoint Condition="$(PyUsingAsan) != 'true'">true</NoEntryPoint>
+      <NoEntryPoint Condition="$(EnableASAN) != 'true'">true</NoEntryPoint>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

PCbuild/python3tdll.vcxproj

@@ -99,7 +99,7 @@
       The ASan runtime thunks need the CRT to be initialized, so keep the
       default entry point when building with AddressSanitizer.
       -->
-      <NoEntryPoint Condition="$(PyUsingAsan) != 'true'">true</NoEntryPoint>
+      <NoEntryPoint Condition="$(EnableASAN) != 'true'">true</NoEntryPoint>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>