Make profiler_builtins an optional dependency of sysroot, not std
#131816
+4
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Zalathar
added
the
T-bootstrap
rustbot
added
the
S-waiting-on-review
This comment was marked as resolved.
This comment was marked as resolved.
|
I have tested this locally and it all seems to work as expected. But this change is subtle enough that I don't expect a rubber-stamp. |
|
It definitely seems subtle, but as often with bootstrap, I'm not sure if we have a better way to test this than to rubber stamp it and send it out to the wild :) Let's see if PGO works properly on the compiler, as a smoke test. @bors try |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 17, 2024
Make `profiler_builtins` an optional dependency of sysroot, not std This avoids unnecessary rebuilds of std (and the compiler) when `build.profiler` is toggled off or on. Fixes rust-lang#131812. --- Background: The `profiler_builtins` crate has been an optional dependency of std (behind a cargo feature) ever since it was added back in rust-lang#42433. But as far as I can tell that has only ever been a convenient way to force the crate to be built, not a genuine dependency. The side-effect of this false dependency is that toggling `build.profiler` causes a rebuild of std and the compiler, which shouldn't be necessary. This PR therefore makes `profiler_builtins` an optional dependency of the dummy sysroot crate (rust-lang#108865), rather than a dependency of std. What makes this change so small is that all of the necessary infrastructure already exists. Previously, bootstrap would enable the `profiler` feature on the sysroot crate, which would forward that feature to std. Now, enabling that feature directly enables sysroot's `profiler_builtins` dependency instead. --- I believe this is more of a bootstrap change than a libs change, so tentatively: r? bootstrap
bjorn3
reviewed
Oct 17, 2024
This avoids unnecessary rebuilds of std (and the compiler) when `build.profiler` is toggled off or on.
Zalathar
force-pushed
the
profiler-feature
branch
from
ca6b5d1
to
bae2596
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This avoids unnecessary rebuilds of std (and the compiler) when
build.profileris toggled off or on.Fixes #131812.
Background: The
profiler_builtinscrate has been an optional dependency of std (behind a cargo feature) ever since it was added back in #42433. But as far as I can tell that has only ever been a convenient way to force the crate to be built, not a genuine dependency.The side-effect of this false dependency is that toggling
build.profilercauses a rebuild of std and the compiler, which shouldn't be necessary. This PR therefore makesprofiler_builtinsan optional dependency of the dummy sysroot crate (#108865), rather than a dependency of std.What makes this change so small is that all of the necessary infrastructure already exists. Previously, bootstrap would enable the
profilerfeature on the sysroot crate, which would forward that feature to std. Now, enabling that feature directly enables sysroot'sprofiler_builtinsdependency instead.I believe this is more of a bootstrap change than a libs change, so tentatively:
r? bootstrap