averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build private swift interface files from stdlib

Browse Source 
We have various pieces of SPI that are getting used in tests that are
failing occasionally. The swiftmodule file has the SPI, so if the
compiler loads from the swiftmodule file, everything works fine. If the
compiler loads the interface from the swiftinterface file, it fails to
find the `startOnMainActor` declaration.
This commit is contained in:
Evan Wilde
2023-03-23 10:45:04 -07:00
parent 3e79583e4e
commit 14956ef82b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
stdlib/cmake/modules/SwiftSource.cmake
View File

@@ -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)
@@ -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)
@@ -720,8 +723,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}"