aboutsummaryrefslogtreecommitdiffstats
path: root/testing/thunderbird/fix-rust-target.patch
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2020-01-14 17:32:44 +0100
committerRasmus Thomsen <oss@cogitri.dev>2020-01-14 18:29:18 +0100
commit2aeacc584fec26c2be13c944c58cde13b15033f7 (patch)
tree5d8d86b1994605de139ba0de064085ccbf383976 /testing/thunderbird/fix-rust-target.patch
parent5262a8cbf4d59b05b7f7aeee61c399828afa5934 (diff)
downloadaports-2aeacc584fec26c2be13c944c58cde13b15033f7.tar.bz2
aports-2aeacc584fec26c2be13c944c58cde13b15033f7.tar.xz
testing/thunderbird: enable on armhf, armv7, ppc64le and x86
Diffstat (limited to 'testing/thunderbird/fix-rust-target.patch')
-rw-r--r--testing/thunderbird/fix-rust-target.patch9
1 files changed, 3 insertions, 6 deletions
diff --git a/testing/thunderbird/fix-rust-target.patch b/testing/thunderbird/fix-rust-target.patch
index f81418efd2..d2d638b9ea 100644
--- a/testing/thunderbird/fix-rust-target.patch
+++ b/testing/thunderbird/fix-rust-target.patch
@@ -1,13 +1,10 @@
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
-@@ -280,9 +280,13 @@
+@@ -278,9 +280,10 @@
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-")
-+
++ fixed_alias = os.environ['RUST_TARGET']
# Check to see whether our rustc has a reasonably functional stdlib
# for our chosen target.
- target_arg = '--target=' + rustc_target.alias
@@ -15,7 +12,7 @@
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 @@
+@@ -317,7 +320,7 @@
os.remove(out_path)
# This target is usable.