58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
--- a/build/moz.configure/rust.configure
|
|
+++ b/build/moz.configure/rust.configure
|
|
@@ -78,9 +78,6 @@
|
|
|
|
return unwrap
|
|
|
|
-rustc = unwrap_rustup(rustc, 'rustc')
|
|
-cargo = unwrap_rustup(cargo, 'cargo')
|
|
-
|
|
|
|
set_config('CARGO', cargo)
|
|
set_config('RUSTC', rustc)
|
|
@@ -348,26 +345,6 @@
|
|
|
|
os.write(in_fd, source)
|
|
os.close(in_fd)
|
|
-
|
|
- cmd = [
|
|
- rustc,
|
|
- '--crate-type', 'staticlib',
|
|
- target_arg,
|
|
- '-o', out_path,
|
|
- in_path,
|
|
- ]
|
|
-
|
|
- def failed():
|
|
- die(dedent('''\
|
|
- Cannot compile for {} with {}
|
|
- The target may be unsupported, or you may not have
|
|
- a rust std library for that target installed. Try:
|
|
-
|
|
- rustup target add {}
|
|
- '''.format(host_or_target.alias, rustc, rustc_target)))
|
|
- check_cmd_output(*cmd, onerror=failed)
|
|
- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
|
|
- failed()
|
|
finally:
|
|
os.remove(in_path)
|
|
os.remove(out_path)
|
|
@@ -405,18 +405,6 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler):
|
|
rust_target_triple = rust_triple_alias(target, c_compiler)
|
|
rust_host_triple = rust_triple_alias(host, host_c_compiler)
|
|
|
|
-
|
|
-@depends(host, rust_host_triple, rustc_info.host)
|
|
-def validate_rust_host_triple(host, rust_host, rustc_host):
|
|
- if rust_host != rustc_host:
|
|
- if host.alias == rust_host:
|
|
- configure_host = host.alias
|
|
- else:
|
|
- configure_host = '{}/{}'.format(host.alias, rust_host)
|
|
- die("The rust compiler host ({}) is not suitable for the configure host ({})."
|
|
- .format(rustc_host, configure_host))
|
|
-
|
|
-
|
|
set_config('RUST_TARGET', rust_target_triple)
|
|
set_config('RUST_HOST_TARGET', rust_host_triple)
|
|
|