[Xcodeproj] Allow adding to LD_RUNPATH_SEARCH_PATHS with a custom xcconfig #1343
Conversation
This file contains 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
ankitspd
requested changes
Sep 19, 2017
Sources/Xcodeproj/pbxproj().swift
Outdated
| @@ -431,7 +431,7 @@ func xcodeProject( | |||
| targetSettings.common.SWIFT_FORCE_STATIC_LINK_STDLIB = "NO" | |||
| targetSettings.common.SWIFT_FORCE_DYNAMIC_LINK_STDLIB = "YES" | |||
|
|
|||
| targetSettings.common.LD_RUNPATH_SEARCH_PATHS += ["@executable_path"] | |||
| targetSettings.common.LD_RUNPATH_SEARCH_PATHS += ["@executable_path", "$(inherited)"] | |||
There was a problem hiding this comment.
This is not required I think. It will add the $(inherited) again.
There was a problem hiding this comment.
Good catch, didn't see the "+" there
Sources/Xcodeproj/pbxproj().swift
Outdated
| } else { | ||
| // We currently force a search path to the toolchain, since we can't | ||
| // establish an expected location for the Swift standard libraries. | ||
| // | ||
| // Note that this means that the built binaries are not suitable for | ||
| // distribution, among other things. | ||
| targetSettings.common.LD_RUNPATH_SEARCH_PATHS = ["$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"] | ||
| targetSettings.common.LD_RUNPATH_SEARCH_PATHS = ["$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", "$(inherited)"] |
There was a problem hiding this comment.
Isn't it more common for $(inherited) to be the first element? If not, this looks fine.
/cc @abertelrud
segiddins
force-pushed
the
seg-inherit-LD_RUNPATH_SEARCH_PATHS
branch
from
381d171
to
644adf5
Compare
|
@aciidb0mb3r thanks for the review, I've addressed the two comments |
|
@swift-ci please smoke test |
ankitspd
approved these changes
Sep 19, 2017
|
Thanks @segiddins! |
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.
I ran into this while trying to allow a project to link against
libclang.dylib.In my
--xcconfig-overrides, I includedLD_RUNPATH_SEARCH_PATHS = ... $(inherited), but those search paths were being completely overwritten by the target's settings.