Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Apr 19, 2023

Fixes #107050. Fixes #108928. Closes #108641.

I recommend reading this commit-by-commit to see the commit descriptions, but the code changes are small.

This also changes the README to suggest configure instead of printf, as well as a few other cleanups described in the commit message.

Before, it only worked for numbers, not strings.
@rustbot
Copy link
Collaborator

rustbot commented Apr 19, 2023

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 19, 2023
jyn514 added 2 commits April 19, 2023 09:50
This also makes some other minor cleanups:
- Suggest `python x.py` on windows instead of `./x.py`, which usually
  doesn't work
- Move the "Configure and Make" section to a subsection of "Building on
  Unix"
- Mention `config.toml` earlier
- Suggest `x.py setup user` on Windows, since `configure` won't work
@onur-ozkan
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 19, 2023

📌 Commit 8a9668d has been approved by ozkanonur

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 Apr 19, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 19, 2023
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#110123 ('./configure' now checks if 'config.toml' exists before writing to that destination)
 - rust-lang#110429 (Spelling src bootstrap)
 - rust-lang#110430 (Spelling src ci)
 - rust-lang#110515 (Don't special-case download-rustc in `maybe_install_llvm`)
 - rust-lang#110521 (Fix `x test lint-docs linkchecker` when download-rustc is enabled)
 - rust-lang#110525 (Fix `tests/run-make-translation` when download-rustc is enabled)
 - rust-lang#110531 (small type system cleanup)
 - rust-lang#110533 (Missing blanket impl trait not public)
 - rust-lang#110540 (Fix wrong comment in rustc_hir/src/hir.rs)
 - rust-lang#110541 (Fix various configure bugs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0820e31 into rust-lang:master Apr 19, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 19, 2023
@jyn514 jyn514 deleted the fix-configure branch April 19, 2023 23:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.

./configure still doesn't work on top-level keys ./configure should set profile = "user" by default

4 participants