diff --git a/atom.gyp b/atom.gyp
index cce72f16c4..e70b65e78a 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -43,7 +43,6 @@
           'dependencies': [
             '<(project_name)_framework',
             '<(project_name)_helper',
-            'vendor/breakpad/breakpad.gyp:dump_syms',
           ],
           'xcode_settings': {
             'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name)',
@@ -155,6 +154,10 @@
               ]
             },
           ],
+        }, {
+          'dependencies': [
+            'vendor/breakpad/breakpad.gyp:dump_syms#host',
+          ],
         }],  # OS=="win"
         ['OS=="linux"', {
           'copies': [
diff --git a/script/dump-symbols.py b/script/dump-symbols.py
index b69754548f..e072e5237b 100755
--- a/script/dump-symbols.py
+++ b/script/dump-symbols.py
@@ -22,10 +22,6 @@ def main(destination):
   (project_name, product_name) = get_names_from_gyp()
 
   if PLATFORM in ['darwin', 'linux']:
-    # Generate the dump_syms tool.
-    build = os.path.join(SOURCE_ROOT, 'script', 'build.py')
-    execute([sys.executable, build, '-c', 'R', '-t', 'dump_syms'])
-
     generate_breakpad_symbols = os.path.join(SOURCE_ROOT, 'tools', 'posix',
                                              'generate_breakpad_symbols.py')
     if PLATFORM == 'darwin':
diff --git a/script/update.py b/script/update.py
index ac9231c776..a03eb44f0d 100755
--- a/script/update.py
+++ b/script/update.py
@@ -5,7 +5,7 @@ import platform
 import subprocess
 import sys
 
-from lib.config import get_target_arch
+from lib.config import get_target_arch, PLATFORM
 from lib.util import get_host_arch
 
 
@@ -41,6 +41,9 @@ def update_gyp():
 
 
 def run_gyp(target_arch, component):
+  env = os.environ.copy()
+  if PLATFORM == 'linux' and target_arch != get_host_arch():
+    env['GYP_CROSSCOMPILE'] = '1'
   python = sys.executable
   if sys.platform == 'cygwin':
     # Force using win32 python on cygwin.
@@ -53,7 +56,7 @@ def run_gyp(target_arch, component):
     '-Dlibrary=static_library',
   ]
   return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.',
-                          'atom.gyp', '-Icommon.gypi'] + defines)
+                          'atom.gyp', '-Icommon.gypi'] + defines, env=env)
 
 
 if __name__ == '__main__':
diff --git a/vendor/breakpad b/vendor/breakpad
index 4427c11703..4ee7e1a703 160000
--- a/vendor/breakpad
+++ b/vendor/breakpad
@@ -1 +1 @@
-Subproject commit 4427c1170387afe46eb3fad259436f1f9f5efa86
+Subproject commit 4ee7e1a703d066861b7bf6fce28526f8ed07dcd6