From dbaa9e98002519bddb147eaac61ee3a4fd801aab Mon Sep 17 00:00:00 2001 From: khanku Date: Sat, 27 May 2017 22:40:07 +0200 Subject: [PATCH] fix-rust-target.patch Allow us to just set RUST_TARGET ourselves instead of hacking around in mozilla's weird custom build system... Co-Authored-By: Ivan Delalande Co-Authored-By: Marian Buschsieweke Co-Authored-By: Rasmus Thomsen Co-Authored-By: ptrcnull --- build/moz.configure/rust.configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure index d65e019619aec..d6900660ee601 100644 --- a/build/moz.configure/rust.configure +++ b/build/moz.configure/rust.configure @@ -332,7 +332,9 @@ def rust_supported_targets(rustc): 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, arm_target, rust_supported_targets): # Rust's --target options are similar to, but not exactly the same # as, the autoconf-derived targets we use. An example would be that @@ -488,12 +490,12 @@ def detect_rustc_target(host_or_target, arm_target, rust_supported_targets): 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") -- 2.56.0