Skip to content

Runtimes: in macOS smoke test point to module cache from compiler build #85038

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 3 commits into
base: main
Choose a base branch
from
Open

Runtimes: in macOS smoke test point to module cache from compiler build #85038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6b5bac
Runtimes: in macOS smoke test point to module cache from compiler build
edymtt Oct 21, 2025
fe77279
Attempt to use separate caches for Core, Overlay and Supplemental:wq
edymtt Oct 21, 2025
f903596
Attempt to use separate caches for each Supplemental library
edymtt Oct 21, 2025
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
9 changes: 6 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DSwiftCore_INSTALL_NESTED_SUBDIR=YES
-DSwiftCore_ENABLE_CONCURRENCY=${build_concurrency})
-DSwiftCore_ENABLE_CONCURRENCY=${build_concurrency}
-DSwiftCore_MODULE_CACHE_PATH=${SWIFT_MODULE_CACHE_PATH}-runtimes-core)
if(NOT ${CMAKE_CROSSCOMPILING})
add_dependencies("${stdlib_target}-core" swift-frontend)
endif()
Expand All @@ -1700,7 +1701,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
-DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE
-DSwiftOverlay_MODULE_CACHE_PATH=${SWIFT_MODULE_CACHE_PATH}-runtimes-overlay)

ExternalProject_Add("${stdlib_target}-Supplemental"
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Supplemental"
Expand All @@ -1724,7 +1726,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
-DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE
-DSwiftSupplemental_MODULE_CACHE_PATH=${SWIFT_MODULE_CACHE_PATH}-runtimes-supplemental)
endforeach()
endforeach()
endif()
3 changes: 2 additions & 1 deletion Runtimes/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ add_compile_options(
"$<$<AND:$<NOT:$<BOOL:${SwiftCore_ENABLE_OBJC_INTEROP}>>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -disable-objc-interop>"
"$<$<AND:$<PLATFORM_ID:Windows>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules>"
"$<$<AND:$<BOOL:${SwiftCore_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${SwiftCore_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${SwiftCore_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${SwiftCore_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${SwiftCore_MODULE_CACHE_PATH}>")

include(ExperimentalFeatures)

Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Overlay/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ add_compile_options(
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enforce-exclusivity=unchecked>"
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -target-min-inlining-version -Xfrontend min>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

include(ExperimentalFeatures)

Expand Down
18 changes: 12 additions & 6 deletions Runtimes/Supplemental/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ if(SwiftRuntime_ENABLE_stringprocessing)
# To ensure incremental builds work as expected
BUILD_ALWAYS 1
CMAKE_ARGS
${COMMON_OPTIONS})
${COMMON_OPTIONS}
-DSwiftStringProcessing_MODULE_CACHE_PATH=${SwiftSupplemental_MODULE_CACHE_PATH}-stringprocessing)
endif()

# Synchronization
Expand All @@ -68,7 +69,8 @@ if(SwiftRuntime_ENABLE_synchronization)
# To ensure incremental builds work as expected
BUILD_ALWAYS 1
CMAKE_ARGS
${COMMON_OPTIONS})
${COMMON_OPTIONS}
-DSwiftSynchronization_MODULE_CACHE_PATH=${SwiftSupplemental_MODULE_CACHE_PATH}-synchronization)
endif()

# Distributed
Expand All @@ -81,7 +83,8 @@ if(SwiftRuntime_ENABLE_distributed)
# To ensure incremental builds work as expected
BUILD_ALWAYS 1
CMAKE_ARGS
${COMMON_OPTIONS})
${COMMON_OPTIONS}
-DSwiftDistributed_MODULE_CACHE_PATH=${SwiftSupplemental_MODULE_CACHE_PATH}-distributed)
endif()


Expand All @@ -95,7 +98,8 @@ if(SwiftRuntime_ENABLE_differentiation)
# To ensure incremental builds work as expected
BUILD_ALWAYS 1
CMAKE_ARGS
${COMMON_OPTIONS})
${COMMON_OPTIONS}
-DSwiftDifferentiation_MODULE_CACHE_PATH=${SwiftSupplemental_MODULE_CACHE_PATH}-differentiation)
endif()

# Observation
Expand All @@ -108,7 +112,8 @@ if(SwiftRuntime_ENABLE_observation)
# To ensure incremental builds work as expected
BUILD_ALWAYS 1
CMAKE_ARGS
${COMMON_OPTIONS})
${COMMON_OPTIONS}
-DSwiftObservation_MODULE_CACHE_PATH=${SwiftSupplemental_MODULE_CACHE_PATH}-observation)
endif()

# Runtime
Expand All @@ -121,5 +126,6 @@ if(SwiftRuntime_ENABLE_runtime)
# To ensure incremental builds work as expected
BUILD_ALWAYS 1
CMAKE_ARGS
${COMMON_OPTIONS})
${COMMON_OPTIONS}
-DSwiftRuntime_MODULE_CACHE_PATH=${SwiftSupplemental_MODULE_CACHE_PATH}-runtime)
endif()
3 changes: 2 additions & 1 deletion Runtimes/Supplemental/Differentiation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ add_compile_options(
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature MemberImportVisibility>"
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enforce-exclusivity=unchecked>"
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -target-min-inlining-version -Xfrontend min>"
$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>)
$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

# LNK4049: symbol 'symbol' defined in 'filename.obj' is imported
# LNK4286: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj'
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Supplemental/Distributed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ add_compile_options(
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-lexical-lifetimes=false>"
"$<$<COMPILE_LANGUAGE:Swift>:-warn-implicit-overrides>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

# LNK4049: symbol 'symbol' defined in 'filename.obj' is imported
# LNK4286: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj'
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Supplemental/Observation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ add_compile_options(
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-lexical-lifetimes=false>"
"$<$<COMPILE_LANGUAGE:Swift>:-warn-implicit-overrides>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

# LNK4049: symbol 'symbol' defined in 'filename.obj' is imported
# LNK4286: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj'
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Supplemental/Runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ add_compile_options(
"$<$<COMPILE_LANGUAGE:Swift>:-cxx-interoperability-mode=default>"
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -experimental-spi-only-imports>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

# LNK4049: symbol 'symbol' defined in 'filename.obj' is imported
# LNK4286: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj'
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Supplemental/StringProcessing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ add_compile_options(
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>"
"$<$<COMPILE_LANGUAGE:Swift>:-warn-implicit-overrides>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

# LNK4049: symbol 'symbol' defined in 'filename.obj' is imported
# LNK4286: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj'
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Supplemental/Synchronization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ add_compile_options(
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-lexical-lifetimes=false>"
"$<$<COMPILE_LANGUAGE:Swift>:-warn-implicit-overrides>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

# LNK4049: symbol 'symbol' defined in 'filename.obj' is imported
# LNK4286: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj'
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Supplemental/Volatile/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ add_compile_options(
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
$<$<COMPILE_LANGUAGE:Swift>:-strict-memory-safety>
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>"
"$<$<AND:$<BOOL:${${PROJECT_NAME}_MODULE_CACHE_PATH}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-module-cache-path ${${PROJECT_NAME}_MODULE_CACHE_PATH}>")

# LNK4049: symbol 'symbol' defined in 'filename.obj' is imported
# LNK4286: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj'
Expand Down