Skip to content

Commit

Permalink
Add -rpath entries for non-component builds on Mac
Browse files Browse the repository at this point in the history
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/+/2090331
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Tobin Ehlis <tobine@google.com>
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
  • Loading branch information
jonahryandavis authored and Commit Bot committed Mar 11, 2020
1 parent d644853 commit 90a8af3
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,16 @@ config("shared_library_public_config") {
"-rpath",
"@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) {
Expand Down

0 comments on commit 90a8af3

Please sign in to comment.