Skip to content

Commit

Permalink
Rollup merge of rust-lang#120831 - Nikokrock:pr/disappearing_startup_…
Browse files Browse the repository at this point in the history
…objects, r=onur-ozkan

Startup objects disappearing from sysroot

When launching tests with --keep-stage option, startup objects such as rsbegin.o an rsend.o may disappear from the corresponding stageN compiler.

Fix issue rust-lang#120784
  • Loading branch information
matthiaskrgr authored Feb 9, 2024
2 parents f90cac5 + 575e0aa commit e0d1c15
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ impl Step for Std {
{
builder.info("WARNING: Using a potentially old libstd. This may not behave well.");

builder.ensure(StartupObjects { compiler, target });

self.copy_extra_objects(builder, &compiler, target);

builder.ensure(StdLink::from_std(self, compiler));
Expand Down

0 comments on commit e0d1c15

Please sign in to comment.