diff options
Diffstat (limited to 'python/servo/command_base.py')
| -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": |