Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-08 16:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19763 - servo:unincremental, r=nox

Browse source 
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 -->
This commit is contained in:
bors-servo 2018-01-18 04:08:02 -06:00 • committed by GitHub
commit f3220eab1e
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/servo/command_base.py
View file

@ -278,7 +278,7 @@ class CommandBase(object):
self.config["build"].setdefault("debug-mozjs", False) self.config["build"].setdefault("debug-mozjs", False)
self.config["build"].setdefault("ccache", "") self.config["build"].setdefault("ccache", "")
self.config["build"].setdefault("rustflags", "") 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["build"].setdefault("thinlto", False)
self.config.setdefault("android", {}) self.config.setdefault("android", {})
@ -296,10 +296,6 @@ class CommandBase(object):
def set_use_geckolib_toolchain(self, use_geckolib_toolchain=True): def set_use_geckolib_toolchain(self, use_geckolib_toolchain=True):
self._use_geckolib_toolchain = use_geckolib_toolchain 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): def toolchain(self):
if self._use_geckolib_toolchain: if self._use_geckolib_toolchain:
@ -439,6 +435,8 @@ class CommandBase(object):
if self.config["build"]["incremental"]: if self.config["build"]["incremental"]:
env["CARGO_INCREMENTAL"] = "1" env["CARGO_INCREMENTAL"] = "1"
elif self.config["build"]["incremental"] is not None:
env["CARGO_INCREMENTAL"] = "0"
if extra_lib: if extra_lib:
if sys.platform == "darwin": if sys.platform == "darwin":

9
servobuild.example
View file

@ -1,6 +1,4 @@
# Copy this file to .servobuild in the Servo root directory # Copy this file to .servobuild in the Servo root directory
# Be sure to set the cache-dir correctly, otherwise extra
# copies of the Rust compiler may get downloaded
# Paths starting with "./" are relative to the repo root # Paths starting with "./" are relative to the repo root
@ -40,8 +38,13 @@ debug-mozjs = false
# Any optional flags that will be added to $RUSTFLAGS # Any optional flags that will be added to $RUSTFLAGS
#rustflags = "" #rustflags = ""
# Enable rustc’s incremental compilation # Enable or disable rustc’s incremental compilation
# Cargo’s default is to enable it in debug mode but not in release mode.
# Leaving this key unspecified makes mach keep Cargo’s default.
# It can be set to true or false in order to always enable or always disable
# incremental compilation.
#incremental = false #incremental = false
#incremental = true
# Whether to use ThinLTO or not # Whether to use ThinLTO or not
#thinlto = false #thinlto = false