Skip to content

Reinstate: SwiftDriver: initial work to properly handle android cross-compilation#1667

Merged
hyp merged 3 commits intomainfrom
hyp/reinstate-android-driver-changes-with-fixes
Jul 17, 2024
Merged

Reinstate: SwiftDriver: initial work to properly handle android cross-compilation#1667
hyp merged 3 commits intomainfrom
hyp/reinstate-android-driver-changes-with-fixes

Conversation

@hyp
Copy link
Copy Markdown
Contributor

@hyp hyp commented Jul 16, 2024

This PR reinstates #1560, after it was reverted in #1662.

The revert happened because of a unit test failure in the SwiftDriverTests.SwiftDriverTests testRelativeResourceDir test. This PR fixes this test failure by ensuring that SDKROOT is reset before the test is run, and creates a sibling test that reflects the new behavior.

@hyp hyp requested review from artemcm and compnerd July 16, 2024 02:58
@hyp
Copy link
Copy Markdown
Contributor Author

hyp commented Jul 16, 2024

@swift-ci please test

@hyp
Copy link
Copy Markdown
Contributor Author

hyp commented Jul 16, 2024

@swift-ci please test

Copy link
Copy Markdown
Member

@finagolfin finagolfin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this pull is ill-considered and should not be merged.

let rsrc: VirtualPath
// Prefer the swiftrt.o runtime file from the SDK if it's specified.
if let sdk = targetInfo.sdkPath {
rsrc = VirtualPath.lookup(sdk.path).appending(components: "usr", "lib", "swift")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just like with swiftlang/swift#74696, this is going to break builds.

@compnerd
Copy link
Copy Markdown
Member

@swift-ci please test Windows platform

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.

4 participants