Pass -D_DLL and -D_MT to the linker for tests

barcharcraz · barcharcraz · commit e7291ac54a66 · 2024-05-29T18:33:44.000-07:00
This is required because now that there's only one asan runtime dll
the dynamic/static CRT wholearchived runtime thunk "flavor"
 is determined by passing the /MD or /MDd options, or defining -D_DLL.
diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt
@@ -203,7 +203,7 @@ function(add_asan_tests arch test_runtime)
         CFLAGS ${ASAN_UNITTEST_INSTRUMENTED_CFLAGS} -D_MT -D_DLL
         SOURCES ${ASAN_INST_TEST_SOURCES}
         LINK_FLAGS ${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS}
-          -Wl,-nodefaultlib:libcmt,-defaultlib:msvcrt,-defaultlib:oldnames
+          -D_MT -D_DLL -Wl,-nodefaultlib:libcmt,-defaultlib:msvcrt,-defaultlib:oldnames
         )
     else()
 

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ function(add_asan_tests arch test_runtime)`
`203`	`203`	`CFLAGS ${ASAN_UNITTEST_INSTRUMENTED_CFLAGS} -D_MT -D_DLL`
`204`	`204`	`SOURCES ${ASAN_INST_TEST_SOURCES}`
`205`	`205`	`LINK_FLAGS ${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS}`
`206`		`- -Wl,-nodefaultlib:libcmt,-defaultlib:msvcrt,-defaultlib:oldnames`
	`206`	`+ -D_MT -D_DLL -Wl,-nodefaultlib:libcmt,-defaultlib:msvcrt,-defaultlib:oldnames`
`207`	`207`	`)`
`208`	`208`	`else()`
`209`	`209`