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 @@ -225,7 +225,9 @@ data.setdefault(key, []).append(namespace(rust_target=t, target=info)) 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 ): @@ -340,13 +342,13 @@ 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')