Reinstate: SwiftDriver: initial work to properly handle android cross-compilation #1667
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
|
@swift-ci please test |
compnerd
approved these changes
Jul 16, 2024
Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
Outdated
Show resolved
Hide resolved
|
@swift-ci please test |
artemcm
approved these changes
Jul 16, 2024
finagolfin
requested changes
Jul 16, 2024
| 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") |
There was a problem hiding this comment.
Just like with swiftlang/swift#74696, this is going to break builds.
|
@swift-ci please test Windows platform |
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.
This PR reinstates #1560, after it was reverted in #1662.
The revert happened because of a unit test failure in the
SwiftDriverTests.SwiftDriverTests testRelativeResourceDirtest. 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.