diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-10-11 23:45:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 23:45:51 +0200 |
| commit | 1be64f34317bfe2b5a6d093f59ce082f171b3baf (patch) | |
| tree | 938f1bc50a6cbeaca8734bc7b92d436b51ad1552 | |
| parent | 57504aafe8ade9964df8600249672dbab45dc47f (diff) | |
| parent | 7f974d0aae1a6bf7c8211b6cbd80a4f21606280e (diff) | |
| download | rust-1be64f34317bfe2b5a6d093f59ce082f171b3baf.tar.gz rust-1be64f34317bfe2b5a6d093f59ce082f171b3baf.zip | |
Rollup merge of #89756 - jyn514:bootstrap-times, r=Mark-Simulacrum
Greatly reduce amount of debuginfo compiled for bootstrap itself Rather than compiling rustbuild and all its dependencies with `debuginfo=2`, this compiles dependencies without debuginfo and rustbuild with `debuginfo=1`. On my laptop, this brings compile times down from ~1:20 to ~1:05. See also https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/async.20in.20bootstrap.3F/near/254847594. r? ``@Mark-Simulacrum``
| -rw-r--r-- | Cargo.toml | 9 | ||||
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml index 42dd5d7ef43..8d6afd2b448 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,6 +89,15 @@ gimli.debug = 0 miniz_oxide.debug = 0 object.debug = 0 +# The only package that ever uses debug builds is bootstrap. +# We care a lot about bootstrap's compile times, so don't include debug info for +# dependencies, only bootstrap itself. +[profile.dev] +debug = 0 +[profile.dev.package] +# Only use debuginfo=1 to further reduce compile times. +bootstrap.debug = 1 + # We want the RLS to use the version of Cargo that we've got vendored in this # repository to ensure that the same exact version of Cargo is used by both the # RLS and the Cargo binary itself. The RLS depends on Cargo as a git repository diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 817850b1ec7..1859130a7af 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -933,10 +933,9 @@ class RustBuild(object): env["LIBRARY_PATH"] = os.path.join(self.bin_root(True), "lib") + \ (os.pathsep + env["LIBRARY_PATH"]) \ if "LIBRARY_PATH" in env else "" + # preserve existing RUSTFLAGS env.setdefault("RUSTFLAGS", "") - env["RUSTFLAGS"] += " -Cdebuginfo=2" - build_section = "target.{}".format(self.build) target_features = [] if self.get_toml("crt-static", build_section) == "true": |