Skip to content

[5.9] Build private swift interface files from stdlib #65986

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 2 commits into from
May 23, 2023
Merged

[5.9] Build private swift interface files from stdlib #65986

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcb7825
[5.9] Build private swift interface files from stdlib
etcwilde Mar 23, 2023
5763cef
[5.9] Handle catalyst interface swap
etcwilde Apr 3, 2023
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
25 changes: 20 additions & 5 deletions stdlib/cmake/modules/SwiftSource.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,8 +640,11 @@ function(_compile_swift_files
if(SWIFT_ENABLE_MODULE_INTERFACES)
set(interface_file "${module_base}.swiftinterface")
set(interface_file_static "${module_base_static}.swiftinterface")
set(private_interface_file "${module_base}.private.swiftinterface")
set(private_interface_file_static "${module_base_static}.private.swiftinterface")
list(APPEND swift_module_flags
"-emit-module-interface-path" "${interface_file}")
"-emit-module-interface-path" "${interface_file}"
"-emit-private-module-interface-path" "${private_interface_file}")
endif()

if (NOT SWIFTFILE_IS_STDLIB_CORE)
Expand All @@ -652,7 +655,7 @@ function(_compile_swift_files
set(module_outputs "${module_file}" "${module_doc_file}")

if(interface_file)
list(APPEND module_outputs "${interface_file}")
list(APPEND module_outputs "${interface_file}" "${private_interface_file}")
endif()

set(optional_arg)
Expand Down Expand Up @@ -695,9 +698,11 @@ function(_compile_swift_files

if(SWIFT_ENABLE_MODULE_INTERFACES)
set(maccatalyst_interface_file "${maccatalyst_module_base}.swiftinterface")
list(APPEND maccatalyst_module_outputs "${maccatalyst_interface_file}")
set(maccatalyst_private_interface_file "${maccatalyst_module_base}.private.swiftinterface")
list(APPEND maccatalyst_module_outputs "${maccatalyst_interface_file}" "${maccatalyst_private_interface_file}")
else()
set(maccatalyst_interface_file)
set(maccatalyst_private_interface_file)
endif()

swift_install_in_component(DIRECTORY ${maccatalyst_specific_module_dir}
Expand All @@ -720,8 +725,8 @@ function(_compile_swift_files
set(module_outputs "${module_file}" "${module_doc_file}")
set(module_outputs_static "${module_file_static}" "${module_doc_file_static}")
if(interface_file)
list(APPEND module_outputs "${interface_file}")
list(APPEND module_outputs_static "${interface_file_static}")
list(APPEND module_outputs "${interface_file}" "${private_interface_file}")
list(APPEND module_outputs_static "${interface_file_static}" "${private_interface_file_static}")
endif()

swift_install_in_component(DIRECTORY "${specific_module_dir}"
Expand Down Expand Up @@ -821,13 +826,23 @@ function(_compile_swift_files
list(APPEND maccatalyst_swift_flags
"-I" "${lib_dir}/${maccatalyst_library_subdir}")
set(maccatalyst_swift_module_flags ${swift_module_flags})

# Remove original interface file
list(FIND maccatalyst_swift_module_flags "${interface_file}" interface_file_index)
if(NOT interface_file_index EQUAL -1)
list(INSERT maccatalyst_swift_module_flags ${interface_file_index} "${maccatalyst_interface_file}")
math(EXPR old_interface_file_index "${interface_file_index} + 1")
list(REMOVE_AT maccatalyst_swift_module_flags ${old_interface_file_index})
endif()

# Remove original private interface
list(FIND maccatalyst_swift_module_flags "${private_interface_file}" private_interface_file_index)
if(NOT private_interface_file_index EQUAL -1)
list(INSERT maccatalyst_swift_module_flags ${private_interface_file_index} "${maccatalyst_private_interface_file}")
math(EXPR old_interface_file_index "${private_interface_file_index} + 1")
list(REMOVE_AT maccatalyst_swift_module_flags ${old_interface_file_index})
endif()

# We still need to change the main swift flags
# so we can use the correct modules
# when building for macOS
Expand Down