diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-27 20:21:37 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-27 20:21:37 +0530 |
| commit | d22a7a1912c7cf513931463e7081d2d345e11ff0 (patch) | |
| tree | 83d2a49539e906c00439156e7f4be9634d834394 /python/servo | |
| parent | 61c23588194de998c97f7d6dc3468a1cae6725d7 (diff) | |
| parent | d069841caf93e9a3648b8feeeb14920a7d9d11da (diff) | |
| download | servo-d22a7a1912c7cf513931463e7081d2d345e11ff0.tar.gz servo-d22a7a1912c7cf513931463e7081d2d345e11ff0.zip | |
Auto merge of #10223 - UK992:win32, r=larsbergstrom
Fix ./mach run and ./mach test-unit on Windows
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
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10223)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 3 |
1 files changed, 3 insertions, 0 deletions
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")] |