blob: f81418efd2f5c4af5a760875ea688665fabb7230 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -280,9 +280,13 @@
die("Don't know how to translate {} for rustc".format(
host_or_target.alias))
+ fixed_alias = rustc_target.alias.replace("-gnu", "-musl")
+ if host_or_target.cpu != 'aarch64':
+ fixed_alias = fixed_alias.replace("-unknown-", "-alpine-")
+
# Check to see whether our rustc has a reasonably functional stdlib
# for our chosen target.
- target_arg = '--target=' + rustc_target.alias
+ target_arg = '--target=' + fixed_alias
in_fd, in_path = mkstemp(prefix='conftest', suffix='.rs')
out_fd, out_path = mkstemp(prefix='conftest', suffix='.rlib')
os.close(out_fd)
@@ -319,7 +323,7 @@
os.remove(out_path)
# This target is usable.
- return rustc_target.alias
+ return fixed_alias
return rust_target
|
