Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-05 14:33:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10223 - UK992:win32, r=larsbergstrom

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-03-27 20:21:37 +05:30
commit d22a7a1912
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/command_base.py
View file

@ -261,6 +261,9 @@ class CommandBase(object):
if not self.config["tools"]["system-rust"] \ if not self.config["tools"]["system-rust"] \
or self.config["tools"]["rust-root"]: or self.config["tools"]["rust-root"]:
env["RUST_ROOT"] = 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 # These paths are for when rust-root points to an unpacked installer
extra_path += [path.join(self.config["tools"]["rust-root"], "rustc", "bin")] extra_path += [path.join(self.config["tools"]["rust-root"], "rustc", "bin")]
extra_lib += [path.join(self.config["tools"]["rust-root"], "rustc", "lib")] extra_lib += [path.join(self.config["tools"]["rust-root"], "rustc", "lib")]