Index: mojo/mojo_public.gypi |
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi |
index 2bb9057e46ee32ac16c19f7db12c80ed8d5fff17..9d122b0781aa27819efa33925f806675326ed518 100644 |
--- a/mojo/mojo_public.gypi |
+++ b/mojo/mojo_public.gypi |
@@ -26,15 +26,17 @@ |
'conditions': [ |
['OS=="mac"', { |
'xcode_settings': { |
- # 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/.', ], |
- }, |
+ # Make it a loader-path dependent library. |
+ 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
}, |
+ 'conditions': [ |
+ ['mac_breakpad==1', { |
+ 'variables': { |
+ # A real .dSYM is needed for dump_syms to operate on. |
+ 'mac_real_dsym': 1, |
+ }, |
+ }], |
+ ], |
}], |
], |
}, |
@@ -68,14 +70,8 @@ |
'conditions': [ |
['OS=="mac"', { |
'xcode_settings': { |
- # 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/.', ], |
- }, |
+ # Make it a loader-path dependent library. |
+ 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
}, |
}], |
], |
@@ -103,14 +99,8 @@ |
'conditions': [ |
['OS=="mac"', { |
'xcode_settings': { |
- # 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/.', ], |
- }, |
+ # Make it a loader-path dependent library. |
+ 'DYLIB_INSTALL_NAME_BASE': '@loader_path', |
}, |
}], |
], |