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

Revert "Exclude XCBuildSupport when building with CMake (#7358)" #7371

Merged
merged 3 commits into from
Feb 27, 2024

Conversation

bnbarham
Copy link
Contributor

This reverts commit 5287062, which causes macOS toolchain builds to fail with:

main/main.swift:345: Fatal error: SwiftPM was built without XCBuild support

Also adds the DriverSupport dependency to XCBuildSupport, which was skipped in #7258 because #7358 was merged (but we're reverting that).

…7358)"

This reverts commit 5287062, which
causes macOS toolchain builds to fail with:
```
main/main.swift:345: Fatal error: SwiftPM was built without XCBuild support
```
This was added to the `Package.swift` in swiftlang#7258 but skipped in the CMake
because swiftlang#7358 excluded XCBuildSupport as a CMake target. But that's
reverted here, so we need to add the dependency in.
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

bnbarham commented Feb 27, 2024

Use the new `SwiftCommandState` name rather than `SwiftTool`.
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

@swift-ci please test Windows platform

@MaxDesiatov MaxDesiatov enabled auto-merge (squash) February 27, 2024 07:45
@MaxDesiatov MaxDesiatov merged commit 03fef47 into swiftlang:main Feb 27, 2024
5 checks passed
@bnbarham bnbarham deleted the revert-toolchain-blocker branch February 27, 2024 17:06
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
…7358)" (swiftlang#7371)

This reverts commit 5287062, which
causes macOS toolchain builds to fail with:
```
main/main.swift:345: Fatal error: SwiftPM was built without XCBuild support
```

Also adds the DriverSupport dependency to XCBuildSupport, which was
skipped in swiftlang#7258 because swiftlang#7358 was merged (but we're reverting that).
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
…7358)" (swiftlang#7371)

This reverts commit 5287062, which
causes macOS toolchain builds to fail with:
```
main/main.swift:345: Fatal error: SwiftPM was built without XCBuild support
```

Also adds the DriverSupport dependency to XCBuildSupport, which was
skipped in swiftlang#7258 because swiftlang#7358 was merged (but we're reverting that).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants