Merge pull request #13334 from electron/mas-fix-linking

Fix linking error for MAS build
2018-06-20 09:59:46 -04:00 · 2018-06-20 09:59:46 -04:00 · 552399af2f
commit 552399af2f
parent 55d1dde0f7 2b080ab575
1 changed files with 7 additions and 0 deletions
--- a/electron.gyp
+++ b/electron.gyp
@ -399,6 +399,13 @@
            'atom/common/crash_reporter/crash_reporter_mac.h',
            'atom/common/crash_reporter/crash_reporter_mac.mm',
          ],
+          'dependencies': [
+            # Somehow we have code from Chromium using crashpad, very likely
+            # from components/crash.
+            # Since we do not actually invoke code from components/crash, this
+            # dependency should be eventually optimized out by linker.
+            'vendor/crashpad/client/client.gyp:crashpad_client',
+          ],
        }],  # OS=="mac" and mas_build==1
        ['OS=="linux"', {
          'sources': [