From d069841caf93e9a3648b8feeeb14920a7d9d11da Mon Sep 17 00:00:00 2001 From: UK992 Date: Sun, 27 Mar 2016 13:23:27 +0200 Subject: [PATCH] Fix ./mach run --- python/servo/command_base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 35c35cfe6e9..cf25bc41927 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -261,6 +261,9 @@ class CommandBase(object): if not self.config["tools"]["system-rust"] \ or self.config["tools"]["rust-root"]: env["RUST_ROOT"] = self.config["tools"]["rust-root"] + # Add mingw64 binary path before rust paths to avoid conflict with libstdc++-6.dll + if sys.platform == "msys": + extra_path += [path.join(os.sep, "mingw64", "bin")] # These paths are for when rust-root points to an unpacked installer extra_path += [path.join(self.config["tools"]["rust-root"], "rustc", "bin")] extra_lib += [path.join(self.config["tools"]["rust-root"], "rustc", "lib")]