aboutsummaryrefslogtreecommitdiff
path: root/repos/clang/firefox/fix-rust-target.patch
diff options
context:
space:
mode:
Diffstat (limited to 'repos/clang/firefox/fix-rust-target.patch')
-rw-r--r--repos/clang/firefox/fix-rust-target.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/repos/clang/firefox/fix-rust-target.patch b/repos/clang/firefox/fix-rust-target.patch
new file mode 100644
index 00000000..33319e85
--- /dev/null
+++ b/repos/clang/firefox/fix-rust-target.patch
@@ -0,0 +1,30 @@
+Allow us to just set RUST_TARGET ourselves instead of hacking around in mozilla's
+weird custom build system...
+
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -280,6 +280,9 @@
+ return data
+
+
++@imports('os')
++@imports(_from='mozbuild.util', _import='ensure_unicode')
++@imports(_from='mozbuild.util', _import='system_encoding')
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -411,12 +414,12 @@
+
+ return None
+
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ['RUST_TARGET']
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
+
+- return rustc_target
++ return ensure_unicode(rustc_target, system_encoding)
+
+
+ @imports("os")