diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2017-10-09 19:02:42 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-10-12 14:16:04 +0200 |
| commit | d4933148d4ec0bbf07eb27ebae32224b13ce56f9 (patch) | |
| tree | b72f70a73b786014955bec3ebe4a2bbac6056156 | |
| parent | 82a013ae073e1e546d80866710ca395bb71cab7c (diff) | |
| download | servo-d4933148d4ec0bbf07eb27ebae32224b13ce56f9.tar.gz servo-d4933148d4ec0bbf07eb27ebae32224b13ce56f9.zip | |
Update Rust to 1.22.0-nightly (a47c9f870 2017-10-11)
This allows us to start experimenting with -Z thinlto
| -rw-r--r-- | python/servo/command_base.py | 3 | ||||
| -rw-r--r-- | rust-toolchain | 2 | ||||
| -rw-r--r-- | servobuild.example | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2e6db17aa59..77bb88886fa 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -273,6 +273,7 @@ class CommandBase(object): self.config["build"].setdefault("ccache", "") self.config["build"].setdefault("rustflags", "") self.config["build"].setdefault("incremental", False) + self.config["build"].setdefault("thinlto", False) self.config.setdefault("android", {}) self.config["android"].setdefault("sdk", "") @@ -532,6 +533,8 @@ class CommandBase(object): if geckolib: geckolib_build_path = path.join(self.context.topdir, "target", "geckolib").encode("UTF-8") env["CARGO_TARGET_DIR"] = geckolib_build_path + elif self.config["build"]["thinlto"]: + env['RUSTFLAGS'] += " -Z thinlto" return env diff --git a/rust-toolchain b/rust-toolchain index 0d9867e213b..326f58947d5 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-10-05 +nightly-2017-10-12 diff --git a/servobuild.example b/servobuild.example index f36fa525d67..f1eb98e799c 100644 --- a/servobuild.example +++ b/servobuild.example @@ -57,6 +57,9 @@ debug-mozjs = false # Enable rustc’s incremental compilation #incremental = false +# Whether to use ThinLTO or not +#thinlto = false + # Android information [android] # Defaults to the value of $ANDROID_SDK, $ANDROID_NDK, $ANDROID_TOOLCHAIN, $ANDROID_PLATFORM respectively |