Skip to content

Commit 89db367

Browse files
authored
Merge pull request swiftlang#12450 from compnerd/windows-architecture
build: support cross-compiling multiple Windows SDKs
2 parents 8b9bc02 + 4be3811 commit 89db367

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -774,17 +774,7 @@ endif()
774774
# Should we cross-compile the standard library for Windows?
775775
is_sdk_requested(WINDOWS swift_build_windows)
776776
if(swift_build_windows AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
777-
if("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "aarch64")
778-
configure_sdk_windows(WINDOWS "Windows" "msvc" aarch64)
779-
elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "armv7")
780-
configure_sdk_windows(WINDOWS "Windows" "msvc" armv7)
781-
elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "i686")
782-
configure_sdk_windows(WINDOWS "Windows" "msvc" i686)
783-
elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "x86_64")
784-
configure_sdk_windows(WINDOWS "Windows" "msvc" x86_64)
785-
else()
786-
message(FATAL_ERROR "unable to calculate triple for Windows host on ${SWIFT_HOST_VARIANT_ARCH}")
787-
endif()
777+
configure_sdk_windows(WINDOWS "Windows" "msvc" "aarch64;armv7;i686;x86_64")
788778
endif()
789779

790780
if("${SWIFT_SDKS}" STREQUAL "")

0 commit comments

Comments
 (0)