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

Build with jessie sysroot on ARM

Browse source
This commit is contained in:
Kevin Sawicki 2017-07-21 10:56:25 -07:00 committed by Aleksei Kuzmin
parent adaec2d32b
commit 152d573fbd
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
script/install-sysroot.py
View file

@ -85,10 +85,7 @@ def main(args):
def InstallDefaultSysrootForArch(target_arch): def InstallDefaultSysrootForArch(target_arch):
if target_arch not in VALID_ARCHS: if target_arch not in VALID_ARCHS:
raise Error('Unknown architecture: %s' % target_arch) raise Error('Unknown architecture: %s' % target_arch)
if target_arch in ['amd64', 'arm64', 'i386']: InstallSysroot('Jessie', target_arch)
InstallSysroot('Jessie', target_arch)
else:
InstallSysroot('Wheezy', target_arch)
def InstallSysroot(target_platform, target_arch): def InstallSysroot(target_platform, target_arch):

2
toolchain.gypi
View file

@ -50,7 +50,7 @@
['target_arch=="arm"', { ['target_arch=="arm"', {
# sysroot needs to be an absolute path otherwise it generates # sysroot needs to be an absolute path otherwise it generates
# incorrect results when passed to pkg-config # incorrect results when passed to pkg-config
'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot', 'sysroot%': '<(source_root)/vendor/debian_jessie_arm-sysroot',
}], }],
['target_arch=="arm64"', { ['target_arch=="arm64"', {
'sysroot%': '<(source_root)/vendor/debian_jessie_arm64-sysroot', 'sysroot%': '<(source_root)/vendor/debian_jessie_arm64-sysroot',