Skip to content

Make the config.src handling for downloadable bootstrap more conservative #102581

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Oct 9, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Oct 2, 2022

In particular, this supports build directories within an unrelated git repository. Fixes #102562.

As a side effect, it will fall back to the old logic when the source directory is being built from a tarball within an unrelated git repository. However, that second case is unsupported and untested; we reserve the right to break it in the future.

@cr1901 can you confirm this fixes your problem?
cc @kleisauke, I believe this will also fix your issue (although your use case still isn't supported).

r? @Mark-Simulacrum

…re conservative

In particular, this supports build directories within an unrelated git repository.

As a side effect, it will fall back to the old logic when the source directory is being built from a tarball within an unrelated git repository.
However, that second case is unsupported and untested; we reserve the right to break it in the future.
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 2, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2022
@cr1901
Copy link
Contributor

cr1901 commented Oct 3, 2022

@jyn514 This PR fixes the build issues on my end :D!

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 8, 2022

📌 Commit 67220d6 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors 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 Oct 8, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2022
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#99194 (Fix gdb-cmd for rust-gdbgui)
 - rust-lang#99880 (`EscapeAscii` is not an `ExactSizeIterator`)
 - rust-lang#102524 (rustdoc: remove weird `<a href="#">` wrapper around unsafe triangle)
 - rust-lang#102581 (Make the `config.src` handling for downloadable bootstrap more conservative)
 - rust-lang#102604 (Improve readability of bootstrap's README)
 - rust-lang#102723 (test: run-make: skip when cross-compiling)
 - rust-lang#102815 (rustdoc: remove mobile topbar from source pages instead of hiding it)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5d2c29d into rust-lang:master Oct 9, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 9, 2022
@jyn514 jyn514 deleted the src-detection branch February 25, 2023 18:32
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bootstrap should support build directories within an unrelated git repository
6 participants