Backed out changeset ac23ad5ef0c1 (bug 1542862) as requested by glandium for being obsolete after bug 1536486.

This commit is contained in:
Cosmin Sabou 2019-04-12 02:24:21 +03:00
Родитель c54800711d
Коммит 856169370c
1 изменённых файлов: 2 добавлений и 10 удалений

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

@ -100,9 +100,9 @@ def cargo_info(cargo):
)
@depends(rustc_info, cargo_info, build_project, host, target)
@depends(rustc_info, cargo_info, build_project)
@imports(_from='textwrap', _import='dedent')
def rust_compiler(rustc_info, cargo_info, build_project, host, target):
def rust_compiler(rustc_info, cargo_info, build_project):
if not rustc_info:
die(dedent('''\
Rust compiler not found.
@ -135,14 +135,6 @@ def rust_compiler(rustc_info, cargo_info, build_project, host, target):
installer is available from https://rustup.rs/
'''.format(version, rustc_min_version)))
if host.os == 'OSX' and target.os == 'Android' and version >= '1.33.0':
die(dedent('''\
Cross-Compiling Android on OSX with Rust 1.33 is currently broken, see bug 1536486.
As a workaround: invoke 'rustup override set 1.32.0' in your source directory, then
rerun './mach bootstrap' to pick up the required toolchains.
'''))
if not cargo_info:
die(dedent('''\
Cargo package manager not found.