diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-01 23:55:34 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-03-02 01:39:20 -0300 |
| commit | b95a02111cbc18c810d706c9c522af20674d1f23 (patch) | |
| tree | 6992bbad7e41f6e20588c13406aa02933e2521d9 /community/firefox/fix-rust-target.patch | |
| parent | de46d6ac7a77db3185628df176d9cef27d1b76ad (diff) | |
| download | aports-b95a02111cbc18c810d706c9c522af20674d1f23.tar.bz2 aports-b95a02111cbc18c810d706c9c522af20674d1f23.tar.xz | |
community/firefox: move from testing
Since we support community for stable releases this would also mean
that we'll have to bump nss, nspr and firefox in stable releases,
but I think this should be fine for the 6 months of support we offer.
Diffstat (limited to 'community/firefox/fix-rust-target.patch')
| -rw-r--r-- | community/firefox/fix-rust-target.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/community/firefox/fix-rust-target.patch b/community/firefox/fix-rust-target.patch new file mode 100644 index 0000000000..14f39691cf --- /dev/null +++ b/community/firefox/fix-rust-target.patch @@ -0,0 +1,31 @@ +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 +@@ -224,6 +224,8 @@ + rust_supported_targets, arm_target, when=rust_compiler) + @checking('for rust %s triplet' % host_or_target_str) + @imports('os') ++ @imports(_from='mozbuild.util', _import='ensure_unicode') ++ @imports(_from='mozbuild.util', _import='system_encoding') + @imports(_from='mozbuild.configure.util', _import='LineIO') + @imports(_from='mozbuild.shellutil', _import='quote') + @imports(_from='tempfile', _import='mkstemp') +@@ -328,7 +330,7 @@ + + 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( +@@ -373,7 +375,7 @@ + os.remove(out_path) + + # This target is usable. +- return rustc_target ++ return ensure_unicode(rustc_target, system_encoding) + + return rust_target |