servo: Merge #10223 - Fix ./mach run and ./mach test-unit on Windows (from UK992:win32); r=larsbergstrom

This small hack fix conflict with mingw and rustc ``libstdc++-6.dll``.
This fixes https://github.com/servo/servo/issues/9465 and https://github.com/servo/servo/issues/10048

CC @larsbergstrom @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: d22a7a1912c7cf513931463e7081d2d345e11ff0

servo/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")]