diff options
Diffstat (limited to 'community/firefox-esr/fix-rust-target.patch')
-rw-r--r-- | community/firefox-esr/fix-rust-target.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/community/firefox-esr/fix-rust-target.patch b/community/firefox-esr/fix-rust-target.patch index 14f39691cf8..9342063c33a 100644 --- a/community/firefox-esr/fix-rust-target.patch +++ b/community/firefox-esr/fix-rust-target.patch @@ -3,29 +3,29 @@ 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 @@ +@@ -225,7 +225,9 @@ + data.setdefault(key, []).append(namespace(rust_target=t, target=info)) + return data - return None +- ++@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 + ): +@@ -340,13 +342,13 @@ -- rustc_target = find_candidate(candidates) -+ rustc_target = os.environ['RUST_TARGET'] + return None - if rustc_target is None: - die("Don't know how to translate {} for rustc".format( -@@ -373,7 +375,7 @@ - os.remove(out_path) +- 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) - # This target is usable. -- return rustc_target -+ return ensure_unicode(rustc_target, system_encoding) - return rust_target + @imports('os') |