Merge pull request swiftlang#29838 from drodriguez/windows-fix-host-variant-case-2

Author: swift-ci

cmake/modules/AddSwiftUnittests.cmake

@@ -52,6 +52,9 @@ function(add_swift_unittest test_dirname)
       target_compile_options(${test_dirname} PRIVATE
         -march=core2)
     endif()
+  elseif("${SWIFT_HOST_VARIANT}" STREQUAL "windows")
+    target_compile_definitions("${test_dirname}" PRIVATE
+      _ENABLE_EXTENDED_ALIGNED_STORAGE)
   endif()
 
   find_program(LDLLD_PATH "ld.lld")

unittests/runtime/CMakeLists.txt

@@ -85,11 +85,6 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
                              PRIVATE
                                swiftCore_EXPORTS)
 
-  if(SWIFT_HOST_VARIANT STREQUAL "windows")
-    target_compile_definitions(SwiftRuntimeTests PRIVATE
-      _ENABLE_EXTENDED_ALIGNED_STORAGE)
-  endif()
-
   # FIXME: cross-compile for all variants.
   target_link_libraries(SwiftRuntimeTests
     PRIVATE