Skip to content
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.

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

PackageModel, CoreCommands: fix build flags not passed #6380

Merged
merged 1 commit into from
Apr 4, 2023

Conversation

MaxDesiatov
Copy link
Contributor

Motivation:

When computing SwiftTool/_buildParameters, command-line options that customize BuildFlags values are not merged with BuildFlags from the computed toolchain/destination.

rdar://106077959

Modifications:

Added mutating func append(_: BuildFlags) on the BuildFlags type for easier merging of multiple values into one, which is then used in SwiftTool/_buildParameters.

When computing `SwiftTool/_buildParameters`, command-line options that customize `BuildFlags` values are not merged with `BuildFlags` from the computed toolchain/destination.

Added `mutating func append(_: BuildFlags)` on the `BuildFlags` type for easier merging of multiple values into one, which is then used in `SwiftTool/_buildParameters`.

rdar://106077959
@MaxDesiatov
Copy link
Contributor Author

@swift-ci smoke test

@MaxDesiatov MaxDesiatov enabled auto-merge (squash) April 4, 2023 18:04
@MaxDesiatov MaxDesiatov merged commit 0c22d23 into main Apr 4, 2023
@MaxDesiatov MaxDesiatov deleted the maxd/fix-buildflags branch April 4, 2023 20:53
aleksproger pushed a commit to aleksproger/swift-package-manager that referenced this pull request May 18, 2023
**Content**
- Added logic to resolve SDK paths whe building for Appli platforms
- Added specific structure PlatformSDKPaths insted of simple tuple to represetn paths for platform headers/sdk
- Destination.defaultDestination now instead of silent fallback to host emits error when triple is not supported
- Added changes from swiftlang#6380 to pass --target fla to clang/swiftc with provided triple
- Added validation of supported triples in applePlatformDestination() to ensure correct combination and enforce specifying the os version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants