mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Build dump_syms for host arch

Browse source
This commit is contained in:
Cheng Zhao 2015-07-02 07:10:05 +00:00
parent 9bdefa6f1f
commit c76d87719d
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom.gyp
View file

@ -43,7 +43,6 @@
'dependencies': [ 'dependencies': [
'<(project_name)_framework', '<(project_name)_framework',
'<(project_name)_helper', '<(project_name)_helper',
'vendor/breakpad/breakpad.gyp:dump_syms',
], ],
'xcode_settings': { 'xcode_settings': {
'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name)', 'ATOM_BUNDLE_ID': 'com.<(company_abbr).<(project_name)',
@ -155,6 +154,10 @@
] ]
}, },
], ],
}, {
'dependencies': [
'vendor/breakpad/breakpad.gyp:dump_syms#host',
],
}], # OS=="win" }], # OS=="win"
['OS=="linux"', { ['OS=="linux"', {
'copies': [ 'copies': [

4
script/dump-symbols.py
View file

@ -22,10 +22,6 @@ def main(destination):
(project_name, product_name) = get_names_from_gyp() (project_name, product_name) = get_names_from_gyp()
if PLATFORM in ['darwin', 'linux']: 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 = os.path.join(SOURCE_ROOT, 'tools', 'posix',
'generate_breakpad_symbols.py') 'generate_breakpad_symbols.py')
if PLATFORM == 'darwin': if PLATFORM == 'darwin':

7
script/update.py
View file

@ -5,7 +5,7 @@ import platform
import subprocess import subprocess
import sys import sys
from lib.config import get_target_arch from lib.config import get_target_arch, PLATFORM
from lib.util import get_host_arch from lib.util import get_host_arch
@ -41,6 +41,9 @@ def update_gyp():
def run_gyp(target_arch, component): 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 python = sys.executable
if sys.platform == 'cygwin': if sys.platform == 'cygwin':
# Force using win32 python on cygwin. # Force using win32 python on cygwin.
@ -53,7 +56,7 @@ def run_gyp(target_arch, component):
'-Dlibrary=static_library', '-Dlibrary=static_library',
] ]
return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.', return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.',
'atom.gyp', '-Icommon.gypi'] + defines) 'atom.gyp', '-Icommon.gypi'] + defines, env=env)
if __name__ == '__main__': if __name__ == '__main__':

2
vendor/breakpad vendored

@ -1 +1 @@
Subproject commit 4427c1170387afe46eb3fad259436f1f9f5efa86 Subproject commit 4ee7e1a703d066861b7bf6fce28526f8ed07dcd6