Skip to content

[Build] Disable library evolution in the Static SDK for Linux. #84705

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Build] Disable library evolution in the Static SDK for Linux. #84705

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ function(_add_target_variant_c_compile_flags)
list(APPEND result "-DSWIFT_COMPACT_ABSOLUTE_FUNCTION_POINTER=1")
endif()

if(SWIFT_STDLIB_STABLE_ABI)
if(SWIFT_STDLIB_STABLE_ABI AND NOT "${CFLAGS_SDK}" STREQUAL "LINUX_STATIC")
list(APPEND result "-DSWIFT_LIBRARY_EVOLUTION=1")
else()
list(APPEND result "-DSWIFT_LIBRARY_EVOLUTION=0")
Expand Down
8 changes: 6 additions & 2 deletions stdlib/cmake/modules/SwiftSource.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,9 @@ function(_compile_swift_files
endif()

# The standard library and overlays are built resiliently when SWIFT_STDLIB_STABLE_ABI=On.
if(SWIFTFILE_IS_STDLIB AND NOT SWIFTFILE_IS_FRAGILE AND SWIFT_STDLIB_STABLE_ABI)
if(SWIFTFILE_IS_STDLIB AND NOT SWIFTFILE_IS_FRAGILE
AND SWIFT_STDLIB_STABLE_ABI
AND NOT "${SWIFTFILE_SDK}" STREQUAL "LINUX_STATIC")
list(APPEND swift_flags "-enable-library-evolution")
list(APPEND swift_flags "-library-level" "api")
list(APPEND swift_flags "-Xfrontend" "-require-explicit-availability=ignore")
Expand Down Expand Up @@ -721,7 +723,9 @@ function(_compile_swift_files
set(sibopt_file "${module_base}.O.sib")
set(sibgen_file "${module_base}.sibgen")

if(SWIFT_ENABLE_MODULE_INTERFACES AND NOT SWIFTFILE_IS_FRAGILE)
if(SWIFT_ENABLE_MODULE_INTERFACES
AND NOT SWIFTFILE_IS_FRAGILE
AND NOT "${SWIFTFILE_SDK}" STREQUAL "LINUX_STATIC")
set(interface_file "${module_base}.swiftinterface")
set(interface_file_static "${module_base_static}.swiftinterface")
set(private_interface_file "${module_base}.private.swiftinterface")
Expand Down