diff options
| author |  hlopko <hlopko@google.com> | 2018-02-23 08:52:08 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-23 08:53:36 -0800 |
| commit | f98a7a2fedb3e714cef1038dcb85f83731150246 (patch) | |
| tree | ca657f7ac90978b25d315852875f14ce5856ad2c /src | |
| parent | 5061b090f4e680996685ac71a7f4ebfb36c33544 (diff) | |
Put @loader_path, not $ORIGIN into rpath flags on mac
Fixes 4480.
RELNOTES: None.
PiperOrigin-RevId: 186774229
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java index a12e21ddad..0ed940b78b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java @@ -583,16 +583,22 @@ public class CppActionConfigs { " flag_group {", " iterate_over: 'runtime_library_search_directories'", " flag_group {", - // TODO(b/27153401): This should probably be @loader_path on osx. + ifTrue( supportsEmbeddedRuntimes, " expand_if_all_available: 'is_cc_test_link_action'", + // TODO(b/27153401): This should probably be @loader_path on osx. " flag: ", " '-Wl,-rpath,$EXEC_ORIGIN/%{runtime_library_search_directories}'", " }", " flag_group {", " expand_if_all_available: 'is_not_cc_test_link_action'"), - " flag: '-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}'", + ifLinux( + platform, + " flag: '-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}'"), + ifMac( + platform, + " flag: '-Wl,-rpath,@loader_path/%{runtime_library_search_directories}'"), " }", " }", " }", |