Revert "Swift SDKs: fix toolset.linker.path not passed to -ld-path (#6719)"
#6939
Conversation
#6719)" This reverts commit d328002. This broke existing Swift SDKs: ``` ld.lld: error: unable to find library -ld-path=/Users/neonacho/Library/org.swift.swiftpm/swift-sdks/5.8-RELEASE_rhel_ubi9_aarch64.artifactbundle/5.8-RELEASE_rhel_ubi9_aarch64/aarch64-unknown-linux-gnu/swift.xctoolchain/usr/bin/ld.lld ```
|
@swift-ci please smoke test |
|
@swift-ci please test |
There was a problem hiding this comment.
@MaxDesiatov feel free to bring back once the regressions are addressed
|
cc @kabiroberai |
…-ld-path` (swiftlang#6719)" (swiftlang#6939)" This reverts commit 57d0a55.
|
Ah, the problem is that we can't directly forward Update: created swiftlang/swift-driver#1447. |
|
@MaxDesiatov is there a test we can add to make sure we don't regress? |
|
Unfortunately, this would be caught only by the end-to-end test that's currently implemented in the Swift SDK generator. We'll have to spend some time coming up with some better integration tests for this, especially as they involve Clang. |
|
Maybe we can find a way to enable a cross-repo kind of workflow so that we could run the tests in Swift SDK generator against a specific PR on SwiftPM? Similar to how we can run the compatibility suite if we make larger changes to the package manifest. |
|
Yes, compatibility suite is something I definitely want, just found a regression in cross-compilation to UBI9 with Swift 5.9, which wasn't present with Swift 5.9, only present with certain packages, like swift-log 😭 |
|
Now that swiftlang/swift-driver#1447 is merged we should be able to revert this. @neonichu will you put up a PR or shall I? |
#6719)" (#6939) This reverts commit d328002. This broke existing Swift SDKs: ``` ld.lld: error: unable to find library -ld-path=/Users/neonacho/Library/org.swift.swiftpm/swift-sdks/5.8-RELEASE_rhel_ubi9_aarch64.artifactbundle/5.8-RELEASE_rhel_ubi9_aarch64/aarch64-unknown-linux-gnu/swift.xctoolchain/usr/bin/ld.lld ```
#6719)" (#6939) This reverts commit d328002. This broke existing Swift SDKs: ``` ld.lld: error: unable to find library -ld-path=/Users/neonacho/Library/org.swift.swiftpm/swift-sdks/5.8-RELEASE_rhel_ubi9_aarch64.artifactbundle/5.8-RELEASE_rhel_ubi9_aarch64/aarch64-unknown-linux-gnu/swift.xctoolchain/usr/bin/ld.lld ```
This reverts commit 57d0a55 and PR #6939. Now that swiftlang/swift-driver#1447 and its 5.10 counterpart swiftlang/swift-driver#1454 were merged, we can reapply the fix for Swift SDKs linker metadata not being handled.
This reverts commit 57d0a55 and PR #6939. Now that swiftlang/swift-driver#1447 and its 5.10 counterpart swiftlang/swift-driver#1454 were merged, we can reapply the fix for Swift SDKs linker metadata not being handled. Resolves rdar://117049947.
This reverts commit d328002.
This broke existing Swift SDKs: