Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

configure --set support list as arguments #109702

Merged
merged 4 commits into from
Apr 28, 2023

Conversation

chenyukang
Copy link
Member

Fixes #109316

r? @jyn514

@rustbot rustbot added 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 Mar 28, 2023
build = self.serialize_and_parse(["--set", "rust.codegen-backends=cranelift"])
self.assertNotEqual(build.config_toml.find("codegen-backends = ['cranelift']"), -1)
build = self.serialize_and_parse(["--set", "rust.codegen-backends=cranelift,llvm"])
self.assertNotEqual(build.config_toml.find("codegen-backends = ['cranelift', 'llvm']"), -1)
Copy link
Member Author

@chenyukang chenyukang Mar 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I use config_toml.find here because get_string don't support list right now.
I think we need to rewrite get_toml, regular expression match seems won't work well 😂

@jyn514
Copy link
Member

jyn514 commented Mar 28, 2023

I don't have time for reviews right now, please don't assign me.

r? bootstrap

@rustbot rustbot assigned albertlarsan68 and unassigned jyn514 Mar 28, 2023
@albertlarsan68
Copy link
Member

Welcome @albertlarsan68!

I will check on this within the week.
Ping me if this did not happen

@chenyukang
Copy link
Member Author

Ping @albertlarsan68

Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems overall good, one nit.
Sorry for the long wait.

src/bootstrap/configure.py Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Apr 19, 2023

☔ The latest upstream changes (presumably #110546) made this pull request unmergeable. Please resolve the merge conflicts.

@chenyukang chenyukang force-pushed the yukang/fix-109316-configure branch from 70319ed to bbbb478 Compare April 20, 2023 01:36
Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+

@bors
Copy link
Contributor

bors commented Apr 26, 2023

📌 Commit bbbb478881dc02f17679cee90e129512dcb96c7a has been approved by albertlarsan68

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 26, 2023
@bors
Copy link
Contributor

bors commented Apr 26, 2023

⌛ Testing commit bbbb478881dc02f17679cee90e129512dcb96c7a with merge 916b7fe9c67b07f5c55d4b842f5c989ea5149d46...

@bors
Copy link
Contributor

bors commented Apr 26, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 26, 2023
@rust-log-analyzer

This comment has been minimized.

@albertlarsan68 albertlarsan68 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 26, 2023
@chenyukang chenyukang force-pushed the yukang/fix-109316-configure branch from bbbb478 to 787f3fe Compare April 26, 2023 16:34
@albertlarsan68
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 26, 2023

📌 Commit 787f3fe has been approved by albertlarsan68

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 26, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 28, 2023
Rollup of 7 pull requests

Successful merges:

 - rust-lang#109702 (configure --set support list as arguments)
 - rust-lang#110620 (Document `const {}` syntax for `std::thread_local`.)
 - rust-lang#110721 (format panic message only once)
 - rust-lang#110881 (refactor(docs): remove macro resolution fallback)
 - rust-lang#110893 (remove inline const deadcode in typeck)
 - rust-lang#110898 (Remove unused std::sys_common::thread_local_key::Key)
 - rust-lang#110909 (Skip `rustc` version detection on macOS)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6b0da57 into rust-lang:master Apr 28, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

./configure doesn't support lists
6 participants