Skip to content

Use a switch instead of if/else if #9267

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
Oct 31, 2025
Merged

Use a switch instead of if/else if #9267

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
11 changes: 7 additions & 4 deletions Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,13 @@ extension PackagePIFProjectBuilder {
if sourceModule.isCxx {
for platform in ProjectModel.BuildSettings.Platform.allCases {
// darwin & freebsd
if [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .xrOS, .driverKit, .freebsd].contains(platform) {
settings[.OTHER_LDFLAGS, platform] = ["-lc++", "$(inherited)"]
} else if [.android, .linux, .wasi, .openbsd].contains(platform) {
settings[.OTHER_LDFLAGS, platform] = ["-lstdc++", "$(inherited)"]
switch platform {
case .macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .xrOS, .driverKit, .freebsd:
settings[.OTHER_LDFLAGS, platform] = ["-lc++", "$(inherited)"]
case .android, .linux, .wasi, .openbsd:
settings[.OTHER_LDFLAGS, platform] = ["-lstdc++", "$(inherited)"]
case .windows, ._iOSDevice:
break
}
}
}
Expand Down
15 changes: 7 additions & 8 deletions Tests/SwiftBuildSupportTests/PIFBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,13 @@ struct PIFBuilderTests {

for platform in ProjectModel.BuildSettings.Platform.allCases {
let ld_flags = releaseConfig.settings[.OTHER_LDFLAGS, platform]
if [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .xrOS, .driverKit, .freebsd].contains(platform) {
#expect(ld_flags == ["-lc++", "$(inherited)"], "for platform \(platform)")
} else if [.android, .linux, .wasi, .openbsd].contains(platform) {
#expect(ld_flags == ["-lstdc++", "$(inherited)"], "for platform \(platform)")
} else if [.windows, ._iOSDevice].contains(platform) {
#expect(ld_flags == nil, "for platform \(platform)")
} else {
Issue.record("Unexpected platform \(platform)")
switch platform {
case .macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .xrOS, .driverKit, .freebsd:
#expect(ld_flags == ["-lc++", "$(inherited)"], "for platform \(platform)")
case .android, .linux, .wasi, .openbsd:
#expect(ld_flags == ["-lstdc++", "$(inherited)"], "for platform \(platform)")
case .windows, ._iOSDevice:
#expect(ld_flags == nil, "for platform \(platform)")
}
}
}
Expand Down