Copy bin/* and lib/*.dylib files to stage0-sysroot

[KittyBorgX]

Fixes #101691

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ozkanonur (or someone else) soon.

Please see the contribution instructions for more information.

[KittyBorgX]

r? @jyn514

[jyn514]

I don't have time for reviews right now.

r? @ozkanonur

[onur-ozkan]

PR can't be passed in the pipelines currently. Please make sure all the pipelines gets passed successfully then we can review the changes.

[KittyBorgX]

@ozkanonur I've fixed the breaking changes. Do I add a new commit or ammend it to the existing one?

[onur-ozkan]

@ozkanonur I've fixed the breaking changes. Do I add a new commit or ammend it to the existing one?

Ammend it please :)

[jyn514]

@rustbot ready

[onur-ozkan]

ref from the issue:

2. x dist --stage 0 doesn't work:

thread 'main' panicked at 'could not read dir "/home/dawn/projects/rust/build/x86_64-unknown-linux-gnu/stage0-sysroot/bin": Os { code: 2, kind: NotFound, message: "No such file or directory" }', lib.rs:1573:25

Still doesn't work

 remotes/KittyBorgX/master $ ./x dist --stage 0

thread 'main' panicked at 'could not read dir "/home/nimda/devspace/personal/rust2/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends": Os { code: 2, kind: NotFound, message: "No such file or directory" }', lib.rs:1522:25
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

config:

# Includes one of the default files in src/bootstrap/defaults
profile = "compiler"
changelog-seen = 2

[build]
# patch-binaries-for-nix = true
# extended = true
#cargo-native-static = false
# sanitizers = false


[rust]
deny-warnings = false
download-rustc = false

Also, stage0-sysroot doesn't work as toolchain built from x build command.

Here is the output of running cargo with using stage0-sysroot as a toolchain on simple hello world project:

 ~/devspace/stuff/hello  stable $ cargo +issue-101691 run
error: process didn't exit successfully: `rustc -vV` (exit status: 127)
--- stderr
/home/nimda/.rustup/toolchains/issue-101691/bin/rustc: error while loading shared libraries: librustc_driver-c78d16bcb49dc5d0.so: cannot open shared object file: No such file or directory

[KittyBorgX]

I see the issue. The original pr (#101711) broke when rustc and cargo was set which works fine with my PR.
Here's a screenshot:

As to codegen-backends which failed in the above comment:

 remotes/KittyBorgX/master $ ./x dist --stage 0
thread 'main' panicked at 'could not read dir "/home/nimda/devspace/personal/rust2/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends": Os { code: 2, kind: NotFound, message: "No such file or directory" }', lib.rs:1522:25
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

I followed : https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Copying.20binaries.20to.20stage0-sysroot/near/326813495

and didn't copy it. I will work on the same and update this pr.
Sidenote : On like 463, in my current pr, it is x.starts_with(sysroot_lib_dir.join("rustlib").into_boxed_path()) which passes the ci and passes the test locally but doesn't do the actual job that is intended and fails like how you mentioned in the second half of the above comment. But having !x.starts_with(sysroot_lib_dir.join("rustlib").into_boxed_path()) does the job of copying correctly but fails the CI and doesn't pass the tests. This has hit me with a roadblock which forces me to use another option and look into it deeply. Can I take some more time to work on this issue, if that's alright?

[onur-ozkan]

I see the issue. The original pr (#101711) broke when rustc and cargo was set which works fine with my PR. Here's a screenshot:

This doesn't work on x86_64.

  ~  $ rustc +issue-101691 --v
/home/nimda/.rustup/toolchains/issue-101691/bin/rustc: error while loading shared libraries: librustc_driver-c78d16bcb49dc5d0.so: cannot open shared object file: No such file or directory

Can I take some more time to work on this issue, if that's alright?

Please take your time

[KittyBorgX]

@ozkanonur Can you help me? I've found a fix which works and passes the tests but I pulled the upstream changes and git(hub) added a commit. Is there any way I can delete the commit? Or should I close this PR and open a new one?

[onur-ozkan]

@ozkanonur Can you help me? I've found a fix which works and passes the tests but I pulled the upstream changes and git(hub) added a commit. Is there any way I can delete the commit? Or should I close this PR and open a new one?

git reset --hard d8d95b5c0dbfea63b37a390252c5023fd7041bc8
git push --force

This will remove the diffs and commit you mentioned. If you want to merge these 2 commits, do soft reset instead.

[KittyBorgX]

Thank you so much! I've made the necessary changes and pushed it.

[bors]

📌 Commit 6990ab9 has been approved by ozkanonur

It is now in the queue for this repository.

[KittyBorgX]

@ozkanonur and @jyn514 Tysm for helping me throught the PR! I couldn't have done it without your help :D

[onur-ozkan]

congrats and thank you for your first contribution :)

[KittyBorgX]

@bors try @rust-timer queue

[albertlarsan68]

@rust-timer build 89394208c043edd910fa6c950968ca75fcf349c0

[rust-timer]

Finished benchmarking commit (89394208c043edd910fa6c950968ca75fcf349c0): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Warning ⚠: The following benchmark(s) failed to build:

• rustc

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.2%	[-2.2%, -2.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.2%	[-2.2%, -2.2%]	1

[albertlarsan68]

@KittyBorgX ^
This PR does break rustc benches, but not the bootstrap timings, it has them.

[KittyBorgX]

ah alright.
@albertlarsan68 thank you so much for running it :)

[Kobzol]

It's the same thing AFAIK, bootstrap timings = building rustc. The timings there are from a previous run, the "B column" is missing.