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

bootstrap: check for dry run when copying env vars for msvc #112722

Merged
merged 1 commit into from
Jun 18, 2023

Conversation

beepster4096
Copy link
Contributor

The new synthetic targets for mir-opt blessing aren't added to builder.cc during dry runs, causing x.py test tests/mir-opt --bless to crash on MSVC when it tries to copy env vars to the C compiler invocation. This PR adds a check for dry run to fix the panic.

@rustbot
Copy link
Collaborator

rustbot commented Jun 16, 2023

r? @clubby789

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

@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 Jun 16, 2023
@clubby789
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 16, 2023

📌 Commit 3078de7 has been approved by clubby789

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 Jun 16, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 17, 2023
bootstrap: check for dry run when copying env vars for msvc

The new synthetic targets for mir-opt blessing aren't added to `builder.cc` during dry runs, causing `x.py test tests/mir-opt --bless`  to crash on MSVC when it tries to copy env vars to the C compiler invocation. This PR adds a check for dry run to fix the panic.
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 18, 2023
bootstrap: check for dry run when copying env vars for msvc

The new synthetic targets for mir-opt blessing aren't added to `builder.cc` during dry runs, causing `x.py test tests/mir-opt --bless`  to crash on MSVC when it tries to copy env vars to the C compiler invocation. This PR adds a check for dry run to fix the panic.
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 18, 2023
bootstrap: check for dry run when copying env vars for msvc

The new synthetic targets for mir-opt blessing aren't added to `builder.cc` during dry runs, causing `x.py test tests/mir-opt --bless`  to crash on MSVC when it tries to copy env vars to the C compiler invocation. This PR adds a check for dry run to fix the panic.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 18, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#107200 (io: soften ‘at most one write attempt’ requirement in io::Write::write)
 - rust-lang#112667 (Move WF/ConstEvaluatable goal to clause)
 - rust-lang#112685 (std: only depend on dlmalloc for wasm*-unknown)
 - rust-lang#112722 (bootstrap: check for dry run when copying env vars for msvc)
 - rust-lang#112734 (Make `Bound::predicates`  use `Clause`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a066e1b into rust-lang:master Jun 18, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 18, 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.

4 participants