diff options
| author | bors <bors@rust-lang.org> | 2024-02-23 03:44:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-23 03:44:47 +0000 |
| commit | 71ff1c62469cc733855a8914976ee9e26f9fe7cc (patch) | |
| tree | 1f3785034e4656c4fa02dff7a97c3e74a937c933 /tests/rustdoc-js-std/return-specific.js | |
| parent | a28d221a4b31de1bda3debcadd3fa2d9bd988e5b (diff) | |
| parent | c42057f89eb77b7bec1fe460b8aadac3dfc1f2cc (diff) | |
| download | rust-71ff1c62469cc733855a8914976ee9e26f9fe7cc.tar.gz rust-71ff1c62469cc733855a8914976ee9e26f9fe7cc.zip | |
Auto merge of #121341 - GrigorenkoPV:bootstrap-rustup-cargo, r=onur-ozkan
bootstrap: don't resolve symlinks for initial_cargo I have put the following in my `config.toml`: ```toml # Includes one of the default files in src/bootstrap/defaults profile = "compiler" change-id = 121203 [build] cargo = "/usr/bin/cargo" rustc = "/usr/bin/rustc" rustfmt = "/usr/bin/rustfmt" ``` I have rustup installed from Arch's repos, which has all of the above paths be symlinks to `/usr/bin/rustup`. This works just fine with the `argv[0]` trick that rustup uses. However, `bootstrap` resolves symlinks to check whether `cargo` exists and then uses the resolved path, so it ends up calling `rustup` directly expecting it to behave like `cargo`. Which it doesn't. This PR removes the canonicalization step, in turn fixing the issue, but sacrificing a pretty error message. However, this exact thing is checked by `x.py` in advance, so I hope it is not a big deal?
Diffstat (limited to 'tests/rustdoc-js-std/return-specific.js')
0 files changed, 0 insertions, 0 deletions
