Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Define NATIVE_WIN32_PYTHON environment variable

r? @Wafflespeanut or @larsbergstrom

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Reviewable:start -->

---

This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13650)

<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-15 05:14:16 -08:00 • committed by GitHub
commit d6788a5048
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/command_base.py
View file

@ -426,6 +426,10 @@ class CommandBase(object):
# Link moztools # Link moztools
env["MOZTOOLS_PATH"] = path.join(msvc_deps_dir, "moztools", "bin") env["MOZTOOLS_PATH"] = path.join(msvc_deps_dir, "moztools", "bin")
if is_windows():
if not os.environ.get("NATIVE_WIN32_PYTHON"):
env["NATIVE_WIN32_PYTHON"] = sys.executable
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"]