Commit 90a8af38 by Jonah Ryan-Davis Committed by Commit Bot

Add -rpath entries for non-component builds on Mac

Mac was unable to find libvulkan.dylib because non-component builds do not contain these rpath entries. Bug: angleproject:4455 Change-Id: I7a3c452bd3b32c34b33c75b1456f9efa0d77a4ca Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2090331Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTobin Ehlis <tobine@google.com> Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
parent d6448538
...@@ -758,6 +758,16 @@ config("shared_library_public_config") { ...@@ -758,6 +758,16 @@ config("shared_library_public_config") {
"-rpath", "-rpath",
"@executable_path/", "@executable_path/",
] ]
if (build_with_chromium) {
ldflags += [
# Path for loading shared libraries for unbundled binaries.
# From //build/config/mac/BUILD.gn, this is only added for
# component builds. However, since ANGLE always dynamically
# links to libvulkan, it should be re-added for non-component
# builds. (anglebug.com/4455)
"-Wl,-rpath,@loader_path/.",
]
}
} }
if (angle_is_winuwp) { if (angle_is_winuwp) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment