Skip to content

Don't pass empty "/" SDK path to the swift compiler when compiling the stdlib #6466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2017
Merged

Don't pass empty "/" SDK path to the swift compiler when compiling the stdlib #6466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down