Skip to content

Support new convention for WMO module deps artifacts naming in Xcode 26 beta 3 #3212

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 15, 2025
Merged

Support new convention for WMO module deps artifacts naming in Xcode 26 beta 3 #3212

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
14 changes: 8 additions & 6 deletions tools/swiftc_stub/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,14 @@ func touchDepsFiles(isWMO: Bool, paths: [PathKey: URL]) throws {
guard let outputFileMapPath = paths[PathKey.outputFileMap] else { return }

if isWMO {
let dPath = String(
outputFileMapPath.path.dropLast("-OutputFileMap.json".count) +
"-master.d"
)
var url = URL(fileURLWithPath: dPath)
try url.touch()
// Xcode 26 beta 3 changed the naming convention for .d files of WMO modules to
// use a suffix of "-primary" instead of "-master". Support both for now.
let basePath = outputFileMapPath.path.dropLast("-OutputFileMap.json".count)
for suffix in ["-master", "-primary"] {
let dPath = "\(basePath)\(suffix).d"
var url = URL(fileURLWithPath: dPath)
try url.touch()
}
} else {
let data = try Data(contentsOf: outputFileMapPath)
let outputFileMapRaw = try JSONSerialization.jsonObject(
Expand Down