[PackageModel] Inject swift-testing flags only if toolchain is target… #7920
Conversation
This file contains 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
…ting macOS Fixes a bug where swift and linker flags for swift-testing were injected into `extraFlags` of a toolchain that was targeting WASM but used macOS to build. Resolves: swiftlang#7919
xedin
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
francescomikulis,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand and
owenv
as code owners
|
@swift-ci please test |
bnbarham
approved these changes
Aug 26, 2024
This was referenced Aug 26, 2024
dschaefer2
approved these changes
Aug 26, 2024
jakepetroules
approved these changes
Aug 26, 2024
xedin
added a commit
that referenced
this pull request
Aug 26, 2024
… target… (#7922) - Explanation: Fixes a bug where swift and linker flags for swift-testing were injected into `extraFlags` of a toolchain that was targeting WASM but used macOS to build. - Main Branch PR: #7920 - 6.0 Branch PR: #7921 - Resolves: #7919 - Resolves: rdar://134714404 - Risk: Low (only affects cross-compilation to WASM). - Reviewed By: @bnbarham - Testing: Manual testing since this is not currently possible to test automatically.
xedin
added a commit
that referenced
this pull request
Aug 26, 2024
…arget… (#7921) - Explanation: Fixes a bug where swift and linker flags for swift-testing were injected into `extraFlags` of a toolchain that was targeting WASM but used macOS to build. - Main Branch PR: #7920 - Resolves: #7919 - Resolves: rdar://134714404 - Risk: Low (only affects cross-compilation to WASM). - Reviewed By: @bnbarham - Testing: Manual testing since this is not currently possible to test automatically.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…ting macOS
Motivation:
Fixes a bug where swift and linker flags for swift-testing were injected into
extraFlagsof a toolchain that was targeting WASM but used macOS to build.Modifications:
#if os(macOS)withif triple.isMacOSXwhile deriving swift-testing flags for a toolchain.Result:
Resolves: #7919
Resolves: rdar://134714404