Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore the ability to disable incremental compilation #19763

Merged
merged 4 commits into from Jan 18, 2018
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Restore the ability to disable incremental compilation

It became the default in debug mode in the last Rust/Cargo update.
  • Loading branch information
SimonSapin committed Jan 14, 2018
commit fe0d2866f12aabedca5cc4394d642a5bf0e30fbe
@@ -278,7 +278,7 @@ def resolverelative(category, key):
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", {})
@@ -439,6 +439,8 @@ def package_dir(package):

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":
@@ -40,8 +40,10 @@ debug-mozjs = false
# Any optional flags that will be added to $RUSTFLAGS
#rustflags = ""

# Enable rustc’s incremental compilation
# Enable or disable rustc’s incremental compilation
# The default is enabled in debug mode only.
#incremental = false
#incremental = true

This comment has been minimized.

@nox

nox Jan 15, 2018

Member

Having both is a bit weird.

This comment has been minimized.

@SimonSapin

SimonSapin Jan 15, 2018

Author Member

I suppose it’s not clear enough, but the intent is to show that leaving it out of the config file is a third behavior different from true or false. (It’s None in Python. Does TOML have explicit null values? I don’t find it in https://github.com/toml-lang/toml.)

Another option might be to make the "debug" string that third value, or something.


# Whether to use ThinLTO or not
#thinlto = false
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.