diff options
| author | UK992 <urbankrajnc92@gmail.com> | 2016-03-27 13:23:27 +0200 |
|---|---|---|
| committer | UK992 <urbankrajnc92@gmail.com> | 2016-03-27 14:08:34 +0200 |
| commit | d069841caf93e9a3648b8feeeb14920a7d9d11da (patch) | |
| tree | 88a9d384601e57a316b233f9e909b152c131023c /python/servo | |
| parent | 68a8085a2f11d052948145980a0bf8a46471e3a7 (diff) | |
| download | servo-d069841caf93e9a3648b8feeeb14920a7d9d11da.tar.gz servo-d069841caf93e9a3648b8feeeb14920a7d9d11da.zip | |
Fix ./mach run
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")] |