diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-01-18 04:08:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 04:08:02 -0600 |
| commit | f3220eab1e6f39b4817e5ea62755a4dc6cb15c87 (patch) | |
| tree | 1c8bdf4524fa0cf13f72abc82f83b88ee77b05c0 /python | |
| parent | 1f6a864ab5372fe4f59b1a4c3db7cf8e7a79b06d (diff) | |
| parent | e790ee976ee2734705c513ab6ecc47af275c92b7 (diff) | |
| download | servo-f3220eab1e6f39b4817e5ea62755a4dc6cb15c87.tar.gz servo-f3220eab1e6f39b4817e5ea62755a4dc6cb15c87.zip | |
Auto merge of #19763 - servo:unincremental, r=nox
Restore the ability to disable incremental compilation
It became the default in debug mode in the last Rust/Cargo update.
<!-- 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/19763)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/command_base.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index bfc7192df97..360fe1a2701 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -278,7 +278,7 @@ class CommandBase(object): self.config["build"].setdefault("debug-mozjs", False) self.config["build"].setdefault("ccache", "") self.config["build"].setdefault("rustflags", "") - self.config["build"].setdefault("incremental", False) + self.config["build"].setdefault("incremental", None) self.config["build"].setdefault("thinlto", False) self.config.setdefault("android", {}) @@ -296,10 +296,6 @@ class CommandBase(object): def set_use_geckolib_toolchain(self, use_geckolib_toolchain=True): self._use_geckolib_toolchain = use_geckolib_toolchain - if use_geckolib_toolchain: - # We use Cargo Nightly 1.24 with Rust 1.22, - # it passes `-C incremental` to rustc, which is new in Rust 1.24. - self.config["build"]["incremental"] = False def toolchain(self): if self._use_geckolib_toolchain: @@ -439,6 +435,8 @@ class CommandBase(object): if self.config["build"]["incremental"]: env["CARGO_INCREMENTAL"] = "1" + elif self.config["build"]["incremental"] is not None: + env["CARGO_INCREMENTAL"] = "0" if extra_lib: if sys.platform == "darwin": |