bootstrap: add an LC_RPATH relative to the executable
#2548
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
This adds the executable relative path to the runtime path selection to ensure that we use local copies of the libraries to run executables. Without this, the system libraries would be used which may not have changes that the tool was built against.
|
@swift-ci please test |
|
Is this for tensor flow? The libs on system are supposed to be ABI stable so we shouldn't need to pick the latest ones. |
|
Yes, TensorFlow definitely needs this. I think that in general though, this is desirable: if Im experimenting with changes to swiftCore, I should be able to use that version. |
|
I think we can also support experimentation using other ways but this also seems fine. |
|
@swift-ci smoke test |
aciidgh
approved these changes
Feb 5, 2020
|
@swift-ci please smoke test |
dan-zheng
added a commit
to dan-zheng/swift-package-manager
that referenced
this pull request
Feb 6, 2020
…arwin. Add `@executable_path/../lib/swift/<platform>` RPATH on Darwin platforms. This is necessary for experimental toolchains that include libraries not part of the OS (e.g. `PythonKit` or `TensorFlow`). Verified to fix SwiftPM command linker issues for Swift for TensorFlow toolchains: tensorflow/swift#347. Effectively reverts swiftlang#2548: an unverified fix for the same issue that did not work.
dan-zheng
added a commit
to dan-zheng/swift-package-manager
that referenced
this pull request
Feb 6, 2020
Add `@executable_path/../lib/swift/<platform>` RPATH on Darwin platforms. This is necessary for experimental toolchains that include libraries not part of the OS (e.g. `PythonKit` or `TensorFlow`). Verified to fix SwiftPM command linker issues for Swift for TensorFlow toolchains: tensorflow/swift#347. Effectively reverts swiftlang#2548: an unverified fix for the same issue that did not work.
dan-zheng
added a commit
to dan-zheng/swift-package-manager
that referenced
this pull request
Feb 12, 2020
Add `@executable_path/../lib/swift/<platform>` RPATH on Darwin platforms. This is necessary for experimental toolchains that include libraries not part of the OS (e.g. `PythonKit` or `TensorFlow`). Verified to fix SwiftPM command linker issues for Swift for TensorFlow toolchains: tensorflow/swift#347. Effectively reverts swiftlang#2548: an unverified fix for the same issue that did not work.
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 adds the executable relative path to the runtime path selection to
ensure that we use local copies of the libraries to run executables.
Without this, the system libraries would be used which may not have
changes that the tool was built against.