Runtime: extract a Runtime subdirectory for SPM #9063

compnerd · 2025-08-26T16:45:44Z

Re-organise the "runtime" components (i.e. the Package Manifest runtime) into a separate directory. Introduce a separate CMake project for the build of this runtime to allow building the SPM tool with one version of the Swift runtime and the SPM Manifest Runtime witih a separate Swift runtime.

jakepetroules · 2025-08-26T19:19:40Z

Can you elaborate on some of the higher level goals behind this change?

compnerd · 2025-08-26T22:41:25Z

@jakepetroules sure - the higher level goal here is to get to the point where we can build the Swift toolchain on Windows with the bootstrap compiler. With the new experimental SDK, we have Win32 SxS runtimes available and I would like to embed the runtime into the compiler itself. allowing the toolchain to run against the runtime that it was built against while uniformly building all the tools against the same runtime and the same compiler.

Currently, the SPM Manifest runtime is built with the just built compiler and runtime as we build the vast majority of the toolchain with the just built compiler and runtime and rely on luck to build the swift frontend with the bootstrap compiler and runtime and then run against the new runtime (without ABI stability).

This restructuring (it is mostly a move of 3 of the modules) allows us to create a separate subproject that will build only PackageDescription, CompilerPluginSupport, and PackagePlugin modules separately. In doing so, we can now build the package manager with the old runtime and compiler, the SPM manifest runtime with the new runtime and compiler so that we can consume this in a safe way.

compnerd · 2025-08-27T15:19:16Z

@swift-ci please smoke test

compnerd · 2025-08-27T15:19:41Z

@swift-ci please test

compnerd · 2025-08-27T17:24:16Z

@swift-ci please smoke test Linux platform

compnerd · 2025-09-23T21:30:13Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please smoke test

compnerd · 2025-09-24T18:56:04Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please smoke test

rconnell9 · 2025-09-24T20:02:23Z

Can this be done without the large number of moves?

compnerd · 2025-09-25T15:14:21Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please smoke test

compnerd · 2025-09-25T18:11:21Z

Can this be done without the large number of moves?

No, that cannot be done. The large number of moves is due to the DocC bundles being checked in. We could remove the DocC bundles potentially. But we do need to have a new directory in between to allow building as a separate project, so the remaining moves (which are pretty small) need to be done.

compnerd · 2025-10-06T22:24:35Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test macOS platform

compnerd · 2025-10-07T04:04:43Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test macOS platform

compnerd · 2025-10-07T06:41:56Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test

compnerd · 2025-10-07T06:42:07Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test Windows

compnerd · 2025-10-07T15:11:20Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test Windows

compnerd · 2025-10-07T17:54:08Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test

compnerd · 2025-10-07T17:54:20Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test Windows

compnerd · 2025-10-07T19:31:45Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please smoke test Windows platform

owenv · 2025-10-07T19:57:53Z

Took a look at the macOS failure. The bootstrap script has this existing code:

if platform.system() == 'Darwin':
        call(["sed", "-i", "", "s/macosx10.10/macosx%s/" % (g_macos_deployment_target), "build.ninja"], cwd=build_dir)

which looks like an attempt to set the deployment target without configuring the target triple on the compile. Based on the logs, when we build SystemPackage in the bootstrap script, it only runs the link step. So we may be building a copy of SystemPackage earlier in the build without an explicit deployment target (defaulting to 15.0 since that's the builder version), then trying to rebuild later with this sed hack and not actually rebuilding. The only problem with that guess is that I can't find any other builds of SystemPackage elsewhere in the log.

compnerd · 2025-10-07T20:21:13Z

Thanks @owenv! I think that it might've been that we weren't passing -D CMAKE_Swift_COMPILER_TARGET to the swift-system build, resulting in the default value from the compiler being used for the deployment target for the Swift code. 🤞 that this version passes the macOS smoke test (seems to be getting further!)

Package.swift

Re-organise the "runtime" components (i.e. the Package Manifest runtime) into a separate directory. Introduce a separate CMake project for the build of this runtime to allow building the SPM tool with one version of the Swift runtime and the SPM Manifest Runtime witih a separate Swift runtime.

compnerd · 2025-10-07T23:40:57Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test

compnerd · 2025-10-07T23:41:13Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test Windows platform

compnerd · 2025-10-07T23:41:54Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test Windows platform

compnerd · 2025-10-07T23:42:05Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please smoke test Windows platform

compnerd · 2025-10-07T23:45:10Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test Windows platform

jakepetroules · 2025-10-08T00:18:15Z

Utilities/bootstrap

    level=logging.INFO,
 )
-g_macos_deployment_target = '12.0'
+g_macos_deployment_target = '14.0'


Any chance we could tie this to DARWIN_DEPLOYMENT_VERSION_OSX in swiftlang/swift?

I'm not sure how to do that tbh; I think that the best way to do that would be to get rid of this script and drive this process through the tooling in swiftlang/swift.

compnerd · 2025-10-08T04:02:06Z

Please test with following PRs:
swiftlang/swift#84473

@swift-ci please test macOS platform

compnerd force-pushed the runtime branch 2 times, most recently from f3a5555 to 5cb3585 Compare August 26, 2025 17:24

compnerd force-pushed the runtime branch from 5cb3585 to 6f78a27 Compare August 26, 2025 19:28

compnerd force-pushed the runtime branch from 6f78a27 to 8f9743c Compare August 27, 2025 00:55

compnerd mentioned this pull request Aug 27, 2025

build.ps1: accommodate the split SPM runtime build swiftlang/swift#83932

Closed

compnerd marked this pull request as ready for review August 27, 2025 15:19

compnerd requested review from jakepetroules, dschaefer2, shawnhyam, bripeticca, plemarquand, owenv, bkhouri, cmcgee1024 and daveyc123 as code owners August 27, 2025 15:19

compnerd force-pushed the runtime branch from 8f9743c to acae7c4 Compare September 23, 2025 21:27

compnerd requested a review from rconnell9 as a code owner September 23, 2025 21:27

compnerd force-pushed the runtime branch 3 times, most recently from 714a90e to b757253 Compare September 24, 2025 18:55

compnerd force-pushed the runtime branch from 8b45c16 to 3578438 Compare October 6, 2025 22:24

compnerd force-pushed the runtime branch from 3578438 to 8c8fd7d Compare October 7, 2025 04:04

compnerd force-pushed the runtime branch from 8c8fd7d to 636d33b Compare October 7, 2025 17:53

owenv reviewed Oct 7, 2025

View reviewed changes

Package.swift Outdated Show resolved Hide resolved

compnerd force-pushed the runtime branch from 636d33b to 3bf8968 Compare October 7, 2025 23:40

owenv approved these changes Oct 7, 2025

View reviewed changes

compnerd requested review from shahmishal, jakepetroules and owenv October 7, 2025 23:41

owenv approved these changes Oct 7, 2025

View reviewed changes

jakepetroules approved these changes Oct 8, 2025

View reviewed changes

compnerd merged commit 3aff8af into swiftlang:main Oct 8, 2025
6 checks passed

compnerd deleted the runtime branch October 8, 2025 14:57

Runtime: extract a Runtime subdirectory for SPM #9063

Runtime: extract a Runtime subdirectory for SPM #9063

Conversation

compnerd commented Aug 26, 2025

Uh oh!

jakepetroules commented Aug 26, 2025

Uh oh!

compnerd commented Aug 26, 2025

Uh oh!

compnerd commented Aug 27, 2025

Uh oh!

compnerd commented Aug 27, 2025

Uh oh!

compnerd commented Aug 27, 2025

Uh oh!

compnerd commented Sep 23, 2025

Uh oh!

compnerd commented Sep 24, 2025

Uh oh!

rconnell9 commented Sep 24, 2025

Uh oh!

compnerd commented Sep 25, 2025

Uh oh!

compnerd commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compnerd commented Oct 6, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

owenv commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

compnerd commented Oct 7, 2025

Uh oh!

jakepetroules Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

compnerd Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

compnerd commented Oct 8, 2025

Uh oh!

Uh oh!

Uh oh!

compnerd commented Sep 25, 2025 •

edited

Loading