Use symlink_dir to create junctions on Windows instead of trying to use symbolic links in copy_link_internal

[Zoxc]

View all comments

Symbolic links require extra privileges on Windows, so this falls back to creating junctions in symlink_file when operating on a directory.

[rustbot]

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

• Owners of files modified in this PR: bootstrap
• bootstrap expanded to 6 candidates
• Random selection from Mark-Simulacrum, Zalathar, clubby789, jieyouxu

[ChrisDenton]

Junction points only work on directories, not files. A hard link or a file copy would be necessary if symlinks aren't available.

[Zoxc]

Well this seems to only be called to create junctions to directories (on Windows), otherwise I'd be seeing more privilege errors.

[ChrisDenton]

So it sounds like symlink_dir should be being called and it's a bug that symlink_file is.

[Mark-Simulacrum]

@rustbot author

I don't have much context on the details here (especially Windows) but generally speaking it seems plausible that this is a bug in the callsite?

[rustbot]

Reminder, once the PR becomes ready for a review, use @rustbot ready.

[rustbot]

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

[Zoxc]

@rustbot ready

I have moved the logic to the callsite.

[ChrisDenton]

I should be able to look at this later today

r? ChrisDenton

[ChrisDenton]

lgtm

@bors r+ rollup

[rust-bors]

📌 Commit bbd34d2 has been approved by ChrisDenton

It is now in the queue for this repository.

[JonathanBrouwer]

@bors try jobs=x86_64-gnu-distcheck

[JonathanBrouwer]

💔 I suspect this PR failed tests as part of a rollup
@bors r-

After fixing the problem, consider running a try job for the failed job before re-approving.

Link to failure: #161494 (comment)

[rust-bors]

This pull request was unapproved.

This PR was contained in a rollup (#161501), which was unapproved.

View changes since this unapproval

[rust-bors]

💔 Test for 35a958f failed: CI. Failed job:

• try - x86_64-gnu-distcheck (web logs, enhanced plaintext logs)

[rust-log-analyzer]

The job x86_64-gnu-distcheck failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   2: <bootstrap::core::session::Build>::copy_link_internal
             at /checkout/src/bootstrap/src/utils/helpers.rs:56:27
   3: <bootstrap::core::session::Build>::copy_link
             at /checkout/src/bootstrap/src/core/session.rs:1567:14
   4: <bootstrap::core::session::Build>::cp_link_filtered_recurse
             at /checkout/src/bootstrap/src/core/session.rs:1688:26
   5: <bootstrap::core::session::Build>::cp_link_filtered_recurse
             at /checkout/src/bootstrap/src/core/session.rs:1686:26
   6: <bootstrap::core::session::Build>::cp_link_filtered_recurse
             at /checkout/src/bootstrap/src/core/session.rs:1686:26
   7: <bootstrap::core::session::Build>::cp_link_filtered_recurse
             at /checkout/src/bootstrap/src/core/session.rs:1686:26
   8: <bootstrap::core::session::Build>::cp_link_filtered_recurse
             at /checkout/src/bootstrap/src/core/session.rs:1686:26
   9: <bootstrap::core::session::Build>::cp_link_filtered
             at /checkout/src/bootstrap/src/core/session.rs:1664:14
  10: bootstrap::core::build_steps::dist::copy_src_dirs
             at /checkout/src/bootstrap/src/core/build_steps/dist.rs:1184:14
  11: bootstrap::core::build_steps::dist::prepare_source_tarball
             at /checkout/src/bootstrap/src/core/build_steps/dist.rs:1378:5
---
  18: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::test::Distcheck>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1636:36
  19: <bootstrap::core::build_steps::test::Distcheck as bootstrap::core::builder::CommandLineStep>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/test.rs:3864:21
  20: <bootstrap::core::builder::CommandLineStepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:469:13
  21: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:138:19
  22: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1150:9
  23: <bootstrap::core::builder::Builder>::execute_cli
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1108:14
  24: <bootstrap::core::session::Build>::build
             at /checkout/src/bootstrap/src/core/session.rs:631:25
  25: bootstrap::cli_main::main
             at /checkout/src/bootstrap/src/cli_main.rs:162:11
  26: bootstrap::main
             at /checkout/src/bootstrap/src/bin/main.rs:7:5