Skip to content

Revert "SwiftDriver: initial work to properly handle android cross-compilation" #1662

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

Merged
merged 1 commit into from
Jul 13, 2024

Conversation

artemcm
Copy link
Contributor

@artemcm artemcm commented Jul 12, 2024

Reverts #1560

Tentative revert to see if it resolves PR testing on the main repo.

@artemcm
Copy link
Contributor Author

artemcm commented Jul 12, 2024

@swift-ci test

if targetInfo.sdkPath != nil {
for libpath in targetInfo.runtimeLibraryImportPaths {
commandLine.appendFlag(.L)
commandLine.appendPath(VirtualPath.lookup(libpath.path))
Copy link
Member

Choose a reason for hiding this comment

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

This is adding new runtime library paths to all platforms when -sdk is specified, which could be causing build errors.

@hborla
Copy link
Member

hborla commented Jul 13, 2024

@swift-ci please test Linux

@hborla
Copy link
Member

hborla commented Jul 13, 2024

Merging to unblock PR testing

@hborla hborla merged commit ead3302 into main Jul 13, 2024
3 checks passed
@hborla hborla deleted the revert-1560-android branch July 13, 2024 05:10
hyp added a commit that referenced this pull request Jul 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
This reverts commit ead3302, reversing
changes made to 270bf6c.
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.

None yet

3 participants