Cleanup some unnecessary build setting #9234
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Contributor
daveinglis commented Oct 9, 2025
daveinglis commented - fix adding -lc++ to OTHER_LDFLAGS to match native build system.
- remove OTHER_LDRFLAGS setting
| @swift-ci test |
owenv approved these changes Oct 9, 2025
jakepetroules approved these changes Oct 9, 2025
jakepetroules requested changes Oct 9, 2025
- fix adding -lc++ to OTHER_LDFLAGS to match native build system.
daveinglis force-pushed the pif_update branch from ab8dfbb to a1f5e0d Compare daveinglis requested review from bkhouri, bripeticca, cmcgee1024, daveyc123, dschaefer2, plemarquand, rconnell9 and shawnhyam as code owners | @swift-ci test |
1 similar comment
| @swift-ci test |
| @swift-ci test windows |
| @jakepetroules I need you to review and remove you requested change if you are ok with this. |
jakepetroules approved these changes Oct 21, 2025
| | ||
| if sourceModule.isCxx { | ||
| for platform in ProjectModel.BuildSettings.Platform.allCases { | ||
| // darwin & freebsd |
There was a problem hiding this comment.
Instead of if-else, can you use a switch?
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: break // no flags needed }That will benefit from exhaustivity checking and the compiler will force us to implement the right flags when we add a new platform (like NetBSD or QNX for example).
| | ||
| 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) { |
There was a problem hiding this comment.
I'd use a switch here as well
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.