Skip to content

[gardening] align platform checks when enabling bitcode inclusion #40768

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 10, 2022
Merged

[gardening] align platform checks when enabling bitcode inclusion #40768

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
10 changes: 6 additions & 4 deletions stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,9 @@ function(add_swift_target_library_single target name)
# Include LLVM Bitcode slices for iOS, Watch OS, and Apple TV OS device libraries.
set(embed_bitcode_arg)
if(SWIFT_EMBED_BITCODE_SECTION AND NOT SWIFTLIB_SINGLE_DONT_EMBED_BITCODE)
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "IOS" OR "${SWIFTLIB_SINGLE_SDK}" STREQUAL "TVOS" OR "${SWIFTLIB_SINGLE_SDK}" STREQUAL "WATCHOS")
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "IOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "TVOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "WATCHOS")
list(APPEND SWIFTLIB_SINGLE_C_COMPILE_FLAGS "-fembed-bitcode")
set(embed_bitcode_arg EMBED_BITCODE)
endif()
Expand Down Expand Up @@ -1318,9 +1320,9 @@ function(add_swift_target_library_single target name)
endif()
# Include LLVM Bitcode slices for iOS, Watch OS, and Apple TV OS device libraries.
if(SWIFT_EMBED_BITCODE_SECTION AND NOT SWIFTLIB_SINGLE_DONT_EMBED_BITCODE)
if(${SWIFTLIB_SINGLE_SDK} STREQUAL "IOS" OR
${SWIFTLIB_SINGLE_SDK} STREQUAL "TVOS" OR
${SWIFTLIB_SINGLE_SDK} STREQUAL "WATCHOS")
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "IOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "TVOS" OR
"${SWIFTLIB_SINGLE_SDK}" STREQUAL "WATCHOS")
# Please note that using a generator expression to fit
# this in a single target_link_options does not work
# (at least in CMake 3.15 and 3.16),
Expand Down