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 /tools/osx | |
| parent | 5061b090f4e680996685ac71a7f4ebfb36c33544 (diff) | |
Put @loader_path, not $ORIGIN into rpath flags on mac
Fixes 4480.
RELNOTES: None.
PiperOrigin-RevId: 186774229
Diffstat (limited to 'tools/osx')
| -rw-r--r-- | tools/osx/crosstool/CROSSTOOL.tpl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl index 8499e0096b..3e8153e6e3 100644 --- a/tools/osx/crosstool/CROSSTOOL.tpl +++ b/tools/osx/crosstool/CROSSTOOL.tpl @@ -353,7 +353,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -2062,7 +2062,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -3778,7 +3778,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -5497,7 +5497,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -7243,7 +7243,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -8959,7 +8959,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -10663,7 +10663,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -12370,7 +12370,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -14104,7 +14104,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" @@ -15811,7 +15811,7 @@ toolchain { action: "c++-link-pic-static-library" action: "c++-link-alwayslink-pic-static-library" flag_group { - flag: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" + flag: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" } expand_if_all_available: "runtime_library_search_directories" |