Skip to content

Commit 59bf086

Browse files
committed
[windows] Move ENABLE_EXTENDED_ALIGN_STORAGE into AddSwiftUnittest
It will apply to everything that uses add_swift_unittest and hopefully it will avoid all the problems.
1 parent ae664fb commit 59bf086

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

cmake/modules/AddSwiftUnittests.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ function(add_swift_unittest test_dirname)
5252
target_compile_options(${test_dirname} PRIVATE
5353
-march=core2)
5454
endif()
55+
elseif("${SWIFT_HOST_VARIANT}" STREQUAL "windows")
56+
target_compile_definitions("${test_dirname}" PRIVATE
57+
_ENABLE_EXTENDED_ALIGNED_STORAGE)
5558
endif()
5659

5760
find_program(LDLLD_PATH "ld.lld")

unittests/runtime/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
8585
PRIVATE
8686
swiftCore_EXPORTS)
8787

88-
if(SWIFT_HOST_VARIANT STREQUAL "windows")
89-
target_compile_definitions(SwiftRuntimeTests PRIVATE
90-
_ENABLE_EXTENDED_ALIGNED_STORAGE)
91-
endif()
92-
9388
# FIXME: cross-compile for all variants.
9489
target_link_libraries(SwiftRuntimeTests
9590
PRIVATE

0 commit comments

Comments
 (0)