]>
Commit | Line | Data |
---|---|---|
c4492a5f JB |
1 | --- firefox-91.7.1/build/moz.configure/rust.configure.orig 2022-03-13 15:31:36.000000000 +0100 |
2 | +++ firefox-91.7.1/build/moz.configure/rust.configure 2022-04-05 18:19:56.821912735 +0200 | |
3 | @@ -462,28 +462,6 @@ def rust_host_triple( | |
4 | rustc_target = detect_rustc_target( | |
5 | host, compiler_info, arm_target, rust_supported_targets | |
6 | ) | |
7 | - if rustc_target != rustc_host: | |
8 | - if host.alias == rustc_target: | |
7daf7c6f JB |
9 | - configure_host = host.alias |
10 | - else: | |
c4492a5f JB |
11 | - configure_host = "{}/{}".format(host.alias, rustc_target) |
12 | - die( | |
13 | - dedent( | |
14 | - """\ | |
15 | - The rust compiler host ({rustc}) is not suitable for the configure host ({configure}). | |
7daf7c6f | 16 | - |
c4492a5f JB |
17 | - You can solve this by: |
18 | - * Set your configure host to match the rust compiler host by editing your | |
19 | - mozconfig and adding "ac_add_options --host={rustc}". | |
20 | - * Or, install the rust toolchain for {configure}, if supported, by running | |
21 | - "rustup default stable-{rustc_target}" | |
22 | - """.format( | |
23 | - rustc=rustc_host, | |
24 | - configure=configure_host, | |
25 | - rustc_target=rustc_target, | |
26 | - ) | |
27 | - ) | |
28 | - ) | |
29 | assert_rust_compile(host, rustc_target, rustc) | |
30 | return rustc_target | |
7daf7c6f | 31 |