Skip to content

Fix rustup support in default_build_triple for python3 - #79845

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:python3
Dec 13, 2020
Merged

Fix rustup support in default_build_triple for python3#79845
bors merged 1 commit into
rust-lang:masterfrom
jyn514:python3

Conversation

@jyn514

Copy link
Copy Markdown
Member

bootstrap completely ignores all errors when detecting a rustup version,
so this wasn't noticed before.

Fixes the following error:

rustup not detected: a bytes-like object is required, not 'str'
falling back to auto-detect

This also takes the opportunity to only call rustup and other external
commands only once during startup.

Follow-up to #78513.

@jyn514jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Dec 9, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 9, 2020
bootstrap completely ignores all errors when detecting a rustup version,
so this wasn't noticed before.
Fixes the following error:
```
rustup not detected: a bytes-like object is required, not 'str'
falling back to auto-detect
```
This also takes the opportunity to only call rustup and other external
commands only once during startup.
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Dec 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 8909c4d has been approved by Mark-Simulacrum

@borsbors 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 Dec 12, 2020
@JohnTitorJohnTitor mentioned this pull request Dec 13, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 13, 2020
Rollup of 12 pull requests
Successful merges:
- rust-lang#79360 (std::iter: document iteration over `&T` and `&mut T`)
- rust-lang#79398 (Link loop/for keyword)
- rust-lang#79834 (Remove deprecated linked_list_extras methods.)
- rust-lang#79845 (Fix rustup support in default_build_triple for python3)
- rust-lang#79940 (fix more clippy::complexity findings)
- rust-lang#79942 (Add post-init hook for static memory for miri.)
- rust-lang#79954 (Fix building compiler docs with stage 0)
- rust-lang#79963 (Fix typo in `DebruijnIndex` documentation)
- rust-lang#79970 (Misc rustbuild improvements when the LLVM backend isn't used)
- rust-lang#79973 (rustdoc light theme: Fix CSS for selected buttons)
- rust-lang#79984 (Remove an unused dependency that made `rustdoc` crash)
- rust-lang#79985 (Fixes submit event of the search input)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit f80c6ae into rust-lang:masterDec 13, 2020
@rustbotrustbot added this to the 1.50.0 milestone Dec 13, 2020
@jyn514
jyn514 deleted the python3 branch December 13, 2020 14:18
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant 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.

5 participants

@jyn514@rust-highfive@Mark-Simulacrum@bors@rustbot