force compiling std from source if modified #127974

onur-ozkan · 2024-07-19T16:17:32Z

This allows the standard library to be compiled even with download-rustc enabled. Which means it's no longer a requirement to compile rustc in order to compile std.

Ref. #127322 (comment).
Blocker for #122709.

onur-ozkan · 2024-07-19T16:22:10Z

r? bootstrap

Kobzol

It seems a bit unintuitive to me that x build library uses this logic, but x build doesn't. Couldn't this use the same logic as rustdoc, which checks if the library isn't modified?

onur-ozkan · 2024-07-23T16:37:34Z

It seems a bit unintuitive to me that x build library uses this logic, but x build doesn't. Couldn't this use the same logic as rustdoc, which checks if the library isn't modified?

We already compile library if it's changed. This is for compiling library only, while using rustc from CI. Doing this by default with x build would kill the purpose of download-rustc.

Kobzol · 2024-07-23T17:32:57Z

I tested it locally, seems to work fine. We should however somehow document (?) that this only makes sense for rust.download-rustc = true, with if-unchanged it still rebuilds the whole sysroot starting from stage 0.

rustbot · 2024-07-23T17:42:02Z

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

src/bootstrap/src/core/builder/tests.rs

Mark-Simulacrum · 2024-07-27T15:06:06Z

src/bootstrap/src/core/build_steps/compile.rs

@@ -136,7 +142,8 @@ impl Step for Std {
            compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
            target: run.target,
            crates,
-            force_recompile: false,
+            // Force compiling from source as it was explicitly called with `x build library (or std/sysroot)`.
+            force_recompile: !run.builder.paths.is_empty(),


It seems like this will be recompilation even if e.g. x.py build compiler is passed? I'm not sure that gating on just any path is the right call. Shouldn't this use something like "is std modified?" perhaps?

It seems like this will be recompilation even if e.g. x.py build compiler is passed? I'm not sure that gating on just any path is the right call.

No, that shouldn't happen.

Shouldn't this use something like "is std modified?" perhaps?

We can do that but it's not necessary in my opinion. If user explicitly asks for library build, we can do it right away without checking if "is std modified?".

I think it's pretty confusing -- certainly against my expectations -- that the same source tree can produce different results depending on the command (x.py build vs. x.py build library, for example). I'd expect that to always yield the same results, though the path-less (x.py build) would perhaps build more.

If we choose whether to rebuild std based on the paths provided, that violates this basic assumption that I think we have so far upheld.

Changed into if modified logic.

This allows the standard library to be compiled even with `download-rustc` enabled. Which means it's no longer a requirement to compile `rustc` in order to compile `std`. Signed-off-by: onur-ozkan <work@onurozkan.dev>

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Mark-Simulacrum · 2024-08-04T14:03:41Z

@bors r+

bors · 2024-08-04T14:03:43Z

📌 Commit 6fcc630 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…k-Simulacrum force compiling std from source if modified This allows the standard library to be compiled even with `download-rustc` enabled. Which means it's no longer a requirement to compile `rustc` in order to compile `std`. Ref. rust-lang#127322 (comment). Blocker for rust-lang#122709.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#127655 (turn `invalid_type_param_default` into a `FutureReleaseErrorReportInDeps`) - rust-lang#127974 (force compiling std from source if modified) - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.) - rust-lang#128362 (add test for symbol visibility of `#[naked]` functions) - rust-lang#128500 (Add test for updating enum discriminant through pointer) - rust-lang#128630 (docs(resolve): more explain about `target`) - rust-lang#128638 (run-make: enable msvc for `link-dedup`) r? `@ghost` `@rustbot` modify labels: rollup

…k-Simulacrum force compiling std from source if modified This allows the standard library to be compiled even with `download-rustc` enabled. Which means it's no longer a requirement to compile `rustc` in order to compile `std`. Ref. rust-lang#127322 (comment). Blocker for rust-lang#122709.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#127655 (turn `invalid_type_param_default` into a `FutureReleaseErrorReportInDeps`) - rust-lang#127974 (force compiling std from source if modified) - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.) - rust-lang#128309 (Implement cursors for `BTreeSet`) - rust-lang#128500 (Add test for updating enum discriminant through pointer) - rust-lang#128630 (docs(resolve): more explain about `target`) - rust-lang#128631 (handle crates when they are not specified for std docs) - rust-lang#128638 (run-make: enable msvc for `link-dedup`) r? `@ghost` `@rustbot` modify labels: rollup

…k-Simulacrum force compiling std from source if modified This allows the standard library to be compiled even with `download-rustc` enabled. Which means it's no longer a requirement to compile `rustc` in order to compile `std`. Ref. rust-lang#127322 (comment). Blocker for rust-lang#122709.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#127655 (turn `invalid_type_param_default` into a `FutureReleaseErrorReportInDeps`) - rust-lang#127974 (force compiling std from source if modified) - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.) - rust-lang#128309 (Implement cursors for `BTreeSet`) - rust-lang#128500 (Add test for updating enum discriminant through pointer) - rust-lang#128630 (docs(resolve): more explain about `target`) - rust-lang#128638 (run-make: enable msvc for `link-dedup`) r? `@ghost` `@rustbot` modify labels: rollup

…k-Simulacrum force compiling std from source if modified This allows the standard library to be compiled even with `download-rustc` enabled. Which means it's no longer a requirement to compile `rustc` in order to compile `std`. Ref. rust-lang#127322 (comment). Blocker for rust-lang#122709.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#127655 (turn `invalid_type_param_default` into a `FutureReleaseErrorReportInDeps`) - rust-lang#127907 (built-in derive: remove BYTE_SLICE_IN_PACKED_STRUCT_WITH_DERIVE hack and lint) - rust-lang#127974 (force compiling std from source if modified) - rust-lang#128309 (Implement cursors for `BTreeSet`) - rust-lang#128500 (Add test for updating enum discriminant through pointer) - rust-lang#128623 (Do not fire unhandled attribute assertion on multi-segment `AttributeType::Normal` attributes with builtin attribute as first segment) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#127974 - onur-ozkan:force-std-builds, r=Mark-Simulacrum force compiling std from source if modified This allows the standard library to be compiled even with `download-rustc` enabled. Which means it's no longer a requirement to compile `rustc` in order to compile `std`. Ref. rust-lang#127322 (comment). Blocker for rust-lang#122709.

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 19, 2024

rustbot assigned Mark-Simulacrum Jul 19, 2024

This comment has been minimized.

Sign in to view

onur-ozkan force-pushed the force-std-builds branch 3 times, most recently from 2e97e9f to fb5ce7f Compare July 20, 2024 07:43

onur-ozkan added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2024

Kobzol reviewed Jul 23, 2024

View reviewed changes

Mark-Simulacrum reviewed Jul 27, 2024

View reviewed changes

onur-ozkan force-pushed the force-std-builds branch 4 times, most recently from db181e0 to dc87814 Compare July 30, 2024 13:58

onur-ozkan added 2 commits July 30, 2024 17:00

set force_recompile: true if library is modified

bbeff8c

This allows the standard library to be compiled even with `download-rustc` enabled. Which means it's no longer a requirement to compile `rustc` in order to compile `std`. Signed-off-by: onur-ozkan <work@onurozkan.dev>

update download-rustc documentation

6fcc630

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the force-std-builds branch from dc87814 to 6fcc630 Compare July 30, 2024 14:00

onur-ozkan changed the title ~~force compiling std from source if explicitly called~~ force compiling std from source if modified Jul 30, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 4, 2024

matthiaskrgr mentioned this pull request Aug 4, 2024

Rollup of 7 pull requests #128645

Closed

matthiaskrgr mentioned this pull request Aug 4, 2024

Rollup of 7 pull requests #128650

Closed

matthiaskrgr mentioned this pull request Aug 4, 2024

Rollup of 8 pull requests #128658

Closed

matthiaskrgr mentioned this pull request Aug 4, 2024

Rollup of 7 pull requests #128665

Closed

This was referenced Aug 5, 2024

Rollup of 8 pull requests #128671

Closed

Rollup of 6 pull requests #128672

Merged

bors merged commit f6c8b7a into rust-lang:master Aug 5, 2024
6 checks passed

rustbot added this to the 1.82.0 milestone Aug 5, 2024

onur-ozkan deleted the force-std-builds branch August 5, 2024 08:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

force compiling std from source if modified #127974

force compiling std from source if modified #127974

onur-ozkan commented Jul 19, 2024

onur-ozkan commented Jul 19, 2024

This comment has been minimized.

Kobzol left a comment

onur-ozkan commented Jul 23, 2024

Kobzol commented Jul 23, 2024

rustbot commented Jul 23, 2024

Mark-Simulacrum Jul 27, 2024

onur-ozkan Jul 27, 2024

Mark-Simulacrum Jul 28, 2024

onur-ozkan Jul 30, 2024 •

edited

Loading

Mark-Simulacrum commented Aug 4, 2024

bors commented Aug 4, 2024

force compiling std from source if modified #127974

force compiling std from source if modified #127974

Conversation

onur-ozkan commented Jul 19, 2024

onur-ozkan commented Jul 19, 2024

This comment has been minimized.

Kobzol left a comment

Choose a reason for hiding this comment

onur-ozkan commented Jul 23, 2024

Kobzol commented Jul 23, 2024

rustbot commented Jul 23, 2024

Mark-Simulacrum Jul 27, 2024

Choose a reason for hiding this comment

onur-ozkan Jul 27, 2024

Choose a reason for hiding this comment

Mark-Simulacrum Jul 28, 2024

Choose a reason for hiding this comment

onur-ozkan Jul 30, 2024 • edited Loading

Choose a reason for hiding this comment

Mark-Simulacrum commented Aug 4, 2024

bors commented Aug 4, 2024

onur-ozkan Jul 30, 2024 •

edited

Loading