From cb62b5dd2663f0967900a865f3ae1d1e49d15cf9 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Mon, 11 Jul 2016 11:27:24 +1000 Subject: [PATCH 1/2] Ensure all env vars are str This is necessary for the Python build bundled in MozillaBuild. --- python/servo/build_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 0e7151e5efc..f344b050f4e 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -332,7 +332,7 @@ class MachCommands(CommandBase): opts += ["--release"] env = self.build_env() - env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib") + env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib").encode("UTF-8") build_start = time() with cd(path.join("ports", "geckolib")): From ce2447f921527a26cf3b33c16b0d905bb0a7074c Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Mon, 11 Jul 2016 11:28:45 +1000 Subject: [PATCH 2/2] Change to use msvc triple for Windows Python --- python/servo/command_base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index a814f58fbf9..328d0965b65 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -41,7 +41,9 @@ def host_triple(): os_type = "apple-darwin" elif os_type == "android": os_type = "linux-androideabi" - elif os_type == "windows" or os_type.startswith("mingw64_nt-") or os_type.startswith("cygwin_nt-"): + elif os_type == "windows": + os_type = "pc-windows-msvc" + elif os_type.startswith("mingw64_nt-") or os_type.startswith("cygwin_nt-"): os_type = "pc-windows-gnu" elif os_type == "freebsd": os_type = "unknown-freebsd"