Skip to content

utils: build static runtime with static dispatch and closure #82932

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
Jul 10, 2025
Merged

utils: build static runtime with static dispatch and closure #82932

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
4 changes: 4 additions & 0 deletions stdlib/public/Concurrency/DispatchGlobalExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,13 @@ static void initializeDispatchEnqueueFunc(dispatch_queue_t queue, void *obj,
if (SWIFT_RUNTIME_WEAK_CHECK(dispatch_async_swift_job))
func = SWIFT_RUNTIME_WEAK_USE(dispatch_async_swift_job);
#elif defined(_WIN32)
#if defined(dispatch_STATIC)
func = dispatch_async_swift_job;
#else
func = function_cast<dispatchEnqueueFuncType>(
GetProcAddress(LoadLibraryW(L"dispatch.dll"),
"dispatch_async_swift_job"));
#endif
#else
func = function_cast<dispatchEnqueueFuncType>(
dlsym(RTLD_NEXT, "dispatch_async_swift_job"));
Expand Down
11 changes: 8 additions & 3 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2356,13 +2356,17 @@ function Build-ExperimentalRuntime {
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
CMAKE_Swift_COMPILER_WORKS = "YES";
# TODO(compnerd) enforce dynamic linking of BlocksRuntime and dispatch.
CMAKE_Swift_FLAGS = $(if ($Static) { @("-Xcc", "-static-libclosure", "-Xcc", "-Ddispatch_STATIC") } else { @() });
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";

# NOTE(compnerd) we can get away with this currently because we only
# use the C portion of the dispatch build, which is always built
# dynamically.
# use the C portion of the dispatch build, which is supposed to always
# be built dynamically. Currently, we do not do this due to limitations
# of the build system, but because we are building statically, we do
# not link against the runtime and can get away with it.
dispatch_DIR = (Get-ProjectCMakeModules $Platform Dispatch);
SwiftCore_ENABLE_CONCURRENCY = "YES";
}
Expand Down Expand Up @@ -2758,7 +2762,8 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Platform);
CMAKE_Swift_COMPILER_WORKS = "YES";
CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir");
# TODO(compnerd) enforce dynamic linking of BlocksRuntime and dispatch.
CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir", "-Xcc", "-Ddispatch_STATIC");
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();

Expand Down