Upstream Driver changes for Swift-in-Apple-OSs #24787
Conversation
|
@swift-ci Please test |
lib/Driver/DarwinToolChains.cpp
Outdated
| // scenarios of deploying for swift-in-the-OS. We keep it here as an | ||
| // optional behaviour so that people downloading snapshot toolchains for | ||
| // testing new stdlibs will be able to link to the stdlib bundled in that | ||
| // toolchain. |
There was a problem hiding this comment.
We worked out all these careful details about how to deal with Swift in downloadable toolchains differently from Swift in Xcode. Do we have to do any tweaks to the downloadable toolchain configuration? @bob-wilson @Rostepher @shahmishal
There was a problem hiding this comment.
I think that is all in place now, e.g., #20578
There was a problem hiding this comment.
Looking at the context, this is a little different. We don't expect this option to be used on Apple platforms with Swift-in-the-OS, but keeping the support in the compiler seems harmless.
|
@swift-ci Please Build Toolchain macOS Platform |
|
Build failed |
|
Oops. Guess I forgot a cherry-pick. |
|
…oops, I didn't mean to put this in the main repo. Oh well, that's fine. |
|
Build failed |
jrose-apple
force-pushed
the
on-the-rpath-to-greatness
branch
from
ebaab1e
to
9a55399
Compare
|
@swift-ci Please test |
|
@swift-ci Please Build Toolchain macOS Platform |
|
Build failed |
|
Build failed |
jrose-apple
force-pushed
the
on-the-rpath-to-greatness
branch
from
9a55399
to
9c1686b
Compare
|
@swift-ci Please test |
1 similar comment
|
@swift-ci Please test |
|
@swift-ci test |
|
*grumble grumble* |
|
Build failed |
|
Build failed |
|
@swift-ci Please test macOS |
|
Build failed |
|
LLDB failure might indicate something else that needs upstreaming; I'll take a look later. |
|
Build failed |
|
@swift-ci Please smoke test Linux |
|
Build failed |
|
apple/swift-lldb#1588 |
|
apple/swift-lldb#1588 |
…for Swift-in-the-OS. Manual re-application of a patch by Graydon Hoare.
The backwards-deployment install name trickery we're using doesn't handle "patch" components in version numbers, so we still need to provide an rpath even when deploying to macOS 10.14.4.
jrose-apple
force-pushed
the
on-the-rpath-to-greatness
branch
from
c9a4064
to
3694686
Compare
|
apple/swift-lldb#1588 |
|
Build failed |
|
Build failed |
|
Full tests explicitly cancelled because we ran them earlier and I want to get this merged. |
Previously, the default RPATH was set to `/usr/lib/swift`. This caused linker issues on macOS, as tensorflow-branch-specific modules like TensorFlow and Python do not exist in `/usr/lib/swift`. This patch defaults the `-toolchain-stdlib-rpath` flag to be true, so the default RPATH is the toolchain standard library instead of `/usr/lib/swift`. With this default, the linker issues are fixed. A `-no-toolchain-stdlib-path` flag is added to opt out of this default, making `/usr/lib/swift` the RPATH. Add positive/negative tests. `swift test` works on macOS for packages that import/use TensorFlow again. Partially reverts swiftlang#24787. Resolves TF-797.
…` on macOS. (#27206) Previously, the default RPATH was set to `/usr/lib/swift`. This caused linker issues on macOS, as tensorflow-branch-specific modules like TensorFlow and Python do not exist in `/usr/lib/swift`. This patch defaults the `-toolchain-stdlib-rpath` flag to be true, so the default RPATH is the toolchain standard library instead of `/usr/lib/swift`. With this default, the linker issues are fixed. A `-no-toolchain-stdlib-path` flag is added to opt out of this default, making `/usr/lib/swift` the RPATH. Add positive/negative tests. `swift test` works on macOS for packages that import/use TensorFlow again. Partially reverts #24787. Resolves TF-797.
…` on macOS. (#27206) Previously, the default RPATH was set to `/usr/lib/swift`. This caused linker issues on macOS, as tensorflow-branch-specific modules like TensorFlow and Python do not exist in `/usr/lib/swift`. This patch defaults the `-toolchain-stdlib-rpath` flag to be true, so the default RPATH is the toolchain standard library instead of `/usr/lib/swift`. With this default, the linker issues are fixed. A `-no-toolchain-stdlib-path` flag is added to opt out of this default, making `/usr/lib/swift` the RPATH. Add positive/negative tests. `swift test` works on macOS for packages that import/use TensorFlow again. Partially reverts #24787. Resolves TF-797.
Cherry-pick a bunch of changes that deal with the Swift stdlib and overlays living in /usr/lib/swift/, mostly from Graydon before he left the Swift project. These changes shipped in Apple Swift 5.0 but never made it back to open source.
(not urgent at this point because we're so late with it)
rdar://problem/50748941