diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-08 11:14:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 11:14:48 -0700 |
| commit | 35a23bfef394fe451879f09979167b048a7bdc88 (patch) | |
| tree | 7bc826ea658673d9ee6f1ad007dff8c74126f690 /python | |
| parent | 12260b24d0e97ee33116d4b730203e5a2619a499 (diff) | |
| parent | 6519d06b235858376c16807cee579171b77e3535 (diff) | |
| download | servo-35a23bfef394fe451879f09979167b048a7bdc88.tar.gz servo-35a23bfef394fe451879f09979167b048a7bdc88.zip | |
Auto merge of #12338 - upsuper:win-geckolib-fix, r=bholley
Fix geckolib build for Windows
It contains several fixes to make `./mach build-geckolib` work on Windows.
<!-- 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/12338)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/build_commands.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index f43f234a3a2..7a4dba41cfa 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -368,9 +368,10 @@ class MachCommands(CommandBase): opts += ["--release"] build_start = time() + env = self.build_env() with cd(path.join("ports", "geckolib")): ret = call(["cargo", "build"] + opts, - env=self.build_env(), verbose=verbose) + env=env, verbose=verbose) elapsed = time() - build_start # Generate Desktop Notification if elapsed-time > some threshold value |