UnitTestFrameworkPkg: Fix host apps ASAN VS20xx builds

Signed-off-by: Michael D Kinney <[email protected]>
tianocore · Dec 27, 2024 · 22dcafa · 22dcafa
1 parent 084a2b4
commit 22dcafa
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc b/UnitTestFrameworkPkg/UnitTestFrameworkPkgHost.dsc.inc
@@ -53,9 +53,7 @@
   # MSFT
   #
   MSFT:*_*_*_CC_FLAGS               = /EHs
-  MSFT:*_*_*_DLINK_FLAGS            == /out:"$(BIN_DIR)\$(MODULE_NAME_GUID).exe" /pdb:"$(BIN_DIR)\$(MODULE_NAME_GUID).pdb" /IGNORE:4001 /NOLOGO /SUBSYSTEM:CONSOLE /DEBUG /STACK:0x40000,0x40000 /WHOLEARCHIVE
-  MSFT:*_*_IA32_DLINK_FLAGS         = /MACHINE:I386
-  MSFT:*_*_X64_DLINK_FLAGS          = /MACHINE:AMD64
+  MSFT:*_*_*_DLINK_FLAGS            == /nologo /SUBSYSTEM:CONSOLE /DEBUG /out:"$(BIN_DIR)\$(MODULE_NAME_GUID).exe" /pdb:"$(BIN_DIR)\$(MODULE_NAME_GUID).pdb"
 
   MSFT:*_VS2015_IA32_DLINK_FLAGS    = /LIBPATH:"%VS2015_PREFIX%Lib" /LIBPATH:"%VS2015_PREFIX%VC\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86"
   MSFT:*_VS2015x86_IA32_DLINK_FLAGS = /LIBPATH:"%VS2015_PREFIX%Lib" /LIBPATH:"%VS2015_PREFIX%VC\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86"
@@ -68,15 +66,6 @@
   MSFT:*_VS2017_X64_DLINK_FLAGS     = /LIBPATH:"%VCToolsInstallDir%lib\x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64"
   MSFT:*_VS2019_X64_DLINK_FLAGS     = /LIBPATH:"%VCToolsInstallDir%lib\x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64"
   MSFT:*_VS2022_X64_DLINK_FLAGS     = /LIBPATH:"%VCToolsInstallDir%lib\x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64"
-!if $(UNIT_TESTING_ADDRESS_SANITIZER_ENABLE)
-  #
-  # Enable Address Sanitizer for VS2019 and VS2022 for HOST_APPLICATION
-  #
-  MSFT:*_VS2019_IA32_DLINK_FLAGS    = /INFERASANLIBS:NO /WHOLEARCHIVE:clang_rt.asan_cxx_dbg-i386.lib /WHOLEARCHIVE:clang_rt.asan_dbg-i386.lib
-  MSFT:*_VS2022_IA32_DLINK_FLAGS    = /INFERASANLIBS:NO /WHOLEARCHIVE:clang_rt.asan_cxx_dbg-i386.lib /WHOLEARCHIVE:clang_rt.asan_dbg-i386.lib
-  MSFT:*_VS2019_X64_DLINK_FLAGS     = /INFERASANLIBS:NO /WHOLEARCHIVE:clang_rt.asan_cxx_dbg-x86_64.lib /WHOLEARCHIVE:clang_rt.asan_dbg-x86_64.lib
-  MSFT:*_VS2022_X64_DLINK_FLAGS     = /INFERASANLIBS:NO /WHOLEARCHIVE:clang_rt.asan_cxx_dbg-x86_64.lib /WHOLEARCHIVE:clang_rt.asan_dbg-x86_64.lib
-!endif
 
   #
   # GCC