diff options
| author | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 16:32:34 +0000 |
|---|---|---|
| committer | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 16:32:34 +0000 |
| commit | fd9796c5278987464d40619f6b59cc7d46465e9b (patch) | |
| tree | f3e40b3c1638ea073dfbd021cddec96708d9f5e6 /mojo | |
| parent | 7bdda28d5d5fc516479993cf53fc20a1383f3980 (diff) | |
| download | chromium_src-fd9796c5278987464d40619f6b59cc7d46465e9b.zip chromium_src-fd9796c5278987464d40619f6b59cc7d46465e9b.tar.gz chromium_src-fd9796c5278987464d40619f6b59cc7d46465e9b.tar.bz2 | |
Revert 259788 "Fixup mojo dylibs"
Broke Mac GPU bots. content_gl_tests began failing with:
dyld: Library not loaded: @loader_path/libmojo_system.dylib
Referenced from: /tmp/run_tha_testiM3m5a/out/Release/content_gl_tests
Reason: image not found
> Fixup mojo dylibs
>
> BUG=
> R=mark@chromium.org
>
> Review URL: https://codereview.chromium.org/211503005
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/214833004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_public.gypi | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi index 12d139f..aced237 100644 --- a/mojo/mojo_public.gypi +++ b/mojo/mojo_public.gypi @@ -26,17 +26,15 @@ 'conditions': [ ['OS=="mac"', { 'xcode_settings': { - # Make it a loader-path dependent library. - 'DYLIB_INSTALL_NAME_BASE': '@loader_path', + # Make it a run-path dependent library. + 'DYLIB_INSTALL_NAME_BASE': '@rpath', + }, + 'direct_dependent_settings': { + 'xcode_settings': { + # Look for run-path dependent libraries in the loader's directory. + 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], + }, }, - 'conditions': [ - ['mac_breakpad==1', { - 'variables': { - # A real .dSYM is needed for dump_syms to operate on. - 'mac_real_dsym': 1, - }, - }], - ], }], ], }, @@ -70,8 +68,14 @@ 'conditions': [ ['OS=="mac"', { 'xcode_settings': { - # Make it a loader-path dependent library. - 'DYLIB_INSTALL_NAME_BASE': '@loader_path', + # Make it a run-path dependent library. + 'DYLIB_INSTALL_NAME_BASE': '@rpath', + }, + 'direct_dependent_settings': { + 'xcode_settings': { + # Look for run-path dependent libraries in the loader's directory. + 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], + }, }, }], ], @@ -99,8 +103,14 @@ 'conditions': [ ['OS=="mac"', { 'xcode_settings': { - # Make it a loader-path dependent library. - 'DYLIB_INSTALL_NAME_BASE': '@loader_path', + # Make it a run-path dependent library. + 'DYLIB_INSTALL_NAME_BASE': '@rpath', + }, + 'direct_dependent_settings': { + 'xcode_settings': { + # Look for run-path dependent libraries in the loader's directory. + 'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ], + }, }, }], ], |