Install sysroots after applying patches

This commit is contained in:
Aleksei Kuzmin 2017-12-07 01:57:02 +03:00
Родитель 33ab7c2097
Коммит c623d06187
1 изменённых файлов: 8 добавлений и 4 удалений

Просмотреть файл

@ -75,15 +75,14 @@ def main():
if target_arch == 'mips64el' and IS_MIPS64EL_HOST:
os.system('sh script/mips64el/runhooks-mips64el')
if sys.platform == 'linux2':
install_sysroot(target_arch)
elif sys.platform in ['win32', 'cygwin']:
if sys.platform in ['win32', 'cygwin']:
update_toolchain_json()
if target_arch == 'arm64':
install_aarch64_bintools()
return ((apply_patches(target_arch) if args.apply_patches else 0) or
install_sysroot_if_needed(target_arch) or
copy_chromiumcontent_files() or
update_clang() or
setup_mips64el_toolchain(target_arch) or
@ -114,7 +113,10 @@ def chromium_version():
return f.readline().strip()
def install_sysroot(target_arch):
def install_sysroot_if_needed(target_arch):
if sys.platform != 'linux2':
return 0
if target_arch == 'ia32':
target_cpu = 'i386'
elif target_arch == 'x64':
@ -139,6 +141,8 @@ def install_sysroot(target_arch):
subprocess.call(['tar', '-jxf', tar_name, '-C', destination])
filesystem.rm_f(tar_name)
return 0
def install_aarch64_bintools():
destination = os.path.join(VENDOR_DIR, 'binutils-aarch64')