From c94e2a121d00b5709a61a4ffb37542f3d0eaf3f9 Mon Sep 17 00:00:00 2001 From: Hugh Bellamy Date: Fri, 25 Nov 2016 12:31:23 +0000 Subject: [PATCH] Don't pass empty "/" SDK path to the swift compiler when compiling the stdlib --- cmake/modules/AddSwift.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake index 30014c3269a56..4c45ad0eab308 100644 --- a/cmake/modules/AddSwift.cmake +++ b/cmake/modules/AddSwift.cmake @@ -260,8 +260,12 @@ function(_add_variant_swift_compile_flags sdk arch build_type enable_assertions result_var_name) set(result ${${result_var_name}}) + # On Windows, we don't set SWIFT_SDK_WINDOWS_PATH, so don't include it. + if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_PATH}") + endif() + list(APPEND result - "-sdk" "${SWIFT_SDK_${sdk}_PATH}" "-target" "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}" "-resource-dir" "${SWIFTLIB_DIR}")