Improve handing of env vars during bootstrap process by chriswailes · Pull Request #101783 · rust-lang/rust

chriswailes · 2022-09-13T23:27:32Z

This CL modifies the handing of env vars during the bootstrap process in two ways:

Replaces '-' characters with '_' characters in target names to increase compatibility with different shells
Passes Stage0 snapshot compiler related env vars to early invocations of Cargo

rust-highfive · 2022-09-13T23:27:35Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jyn514 (or someone else) soon.

Please see the contribution instructions for more information.

jyn514

Thanks for the PR. The python changes make sense to me but need changes to the implementation, I left comments inline. It would be helpful to know when you need to set these variables, I'm surprised no one has complained before.

The rust changes I'm unsure about , I left a comment inline.

chriswailes · 2022-09-14T18:55:40Z

It would be helpful to know when you need to set these variables, I'm surprised no one has complained before.

We ran into this issue when the lzma-sys crate's build.rs file found the default system cc on an Ubuntu 14.04 image, which was too old to successfully compile the crate's C (or assembly, I can't remember) files.

chriswailes · 2022-09-14T19:10:16Z

@rustbot ready

jyn514 · 2022-09-14T19:27:11Z

@chriswailes you force pushed but I don't see any changes; maybe you forgot to commit them?

chriswailes · 2022-09-14T19:38:12Z

@jyn514 Yup, and then I had to pull, rebase, re-compile... A full yak shave. Sorry about that.

jyn514

r=me with the last nit fixed. Thanks!

jyn514 · 2022-09-14T20:47:58Z

@bors r+

bors · 2022-09-14T20:48:00Z

📌 Commit 8df181d has been approved by jyn514

It is now in the queue for this repository.

Improve handing of env vars during bootstrap process This CL modifies the handing of env vars during the bootstrap process in two ways: 1. Replaces '-' characters with '_' characters in target names to increase compatibility with different shells 2. Passes Stage0 snapshot compiler related env vars to early invocations of Cargo

Dylan-DPC · 2022-09-15T13:11:54Z

@bors r-

failed in rollup

This CL modifies the handing of env vars during the bootstrap process in two ways: 1. Replaces '-' characters with '_' characters in target names to increase compatibility with different shells 2. Passes Stage0 snapshot compiler related env vars to early invocations of Cargo

jyn514 · 2022-09-16T22:10:15Z

@bors r+

bors · 2022-09-16T22:10:16Z

📌 Commit d1291dc has been approved by jyn514

It is now in the queue for this repository.

Improve handing of env vars during bootstrap process This CL modifies the handing of env vars during the bootstrap process in two ways: 1. Replaces '-' characters with '_' characters in target names to increase compatibility with different shells 2. Passes Stage0 snapshot compiler related env vars to early invocations of Cargo

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#101672 (array docs - advertise how to get array from slice) - rust-lang#101781 (Extend list of targets that support dyanmic linking for llvm tools) - rust-lang#101783 (Improve handing of env vars during bootstrap process) - rust-lang#101801 (add note for `layout_of` when query depth overflows) - rust-lang#101824 (rustdoc: add test cases for turning ``[Vec<T>]`` into ``[`Vec<T>`]``) - rust-lang#101861 (Update stdarch) - rust-lang#101873 (Allow building `rust-analyzer-proc-macro-srv` as a standalone tool) - rust-lang#101918 (rustdoc: clean up CSS for All Items and All Crates lists) - rust-lang#101934 (Continue migration of CSS themes) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

In rust-lang#101783 I accidentally removed a load-bearing linker argument. This PR adds it back in.

…an68 Add a linker argument back to boostrap.py In rust-lang#101783 I accidentally removed a load-bearing linker argument. This PR adds it back in. r? jyn514

Add a linker argument back to boostrap.py In rust-lang/rust#101783 I accidentally removed a load-bearing linker argument. This PR adds it back in. r? jyn514

rust-highfive assigned jyn514 Sep 13, 2022

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Sep 13, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 13, 2022

jyn514 suggested changes Sep 14, 2022
View reviewed changes

Comment threadsrc/bootstrap/bootstrap.py Outdated
Comment threadsrc/bootstrap/bootstrap.py Outdated
Comment threadsrc/bootstrap/bootstrap.py Outdated
Comment threadsrc/bootstrap/builder.rs Outdated

jyn514 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 Sep 14, 2022

chriswailes force-pushed the env-vars branch from 4243bcc to 3329466Compare September 14, 2022 19:09

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 14, 2022

chriswailes force-pushed the env-vars branch from 3329466 to 1e5b4adCompare September 14, 2022 19:37

jyn514 approved these changes Sep 14, 2022
View reviewed changes

Comment threadsrc/bootstrap/bootstrap.py Outdated

chriswailes force-pushed the env-vars branch from 1e5b4ad to 8df181dCompare September 14, 2022 20:15

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 Sep 14, 2022

Dylan-DPC mentioned this pull request Sep 15, 2022
Rollup of 6 pull requests #101850
Closed

Dylan-DPC mentioned this pull request Sep 15, 2022
Rollup of 6 pull requests #101853
Closed

aDotInTheVoid mentioned this pull request Sep 15, 2022
Replace check_missing_items.py with jsondoclint#101809
Merged

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 15, 2022

chriswailes force-pushed the env-vars branch from 8df181d to 3f421a6Compare September 16, 2022 20:05

jyn514 suggested changes Sep 16, 2022
View reviewed changes

Comment threadsrc/bootstrap/bootstrap.py Outdated

chriswailes force-pushed the env-vars branch from 3f421a6 to d1291dcCompare September 16, 2022 22:03

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 Sep 16, 2022

matthiaskrgr mentioned this pull request Sep 17, 2022
Rollup of 8 pull requests #101941
Closed

This was referenced Sep 17, 2022
Rollup of 1 pull requests #101945
Closed
Rollup of 9 pull requests #101946
Merged

bors merged commit 9c32773 into rust-lang:masterSep 17, 2022

rustbot added this to the 1.65.0 milestone Sep 17, 2022

chriswailes deleted the env-vars branch September 19, 2022 17:07

cuviper modified the milestones: 1.65.0, 1.66.0 Oct 4, 2022

chriswailes added a commit to chriswailes/rust that referenced this pull request Feb 3, 2023
Add a linker argument back to boostrap.py
134a5ae
In rust-lang#101783 I accidentally removed a load-bearing linker argument. This PR adds it back in.

chriswailes mentioned this pull request Feb 3, 2023
Add a linker argument back to boostrap.py #107618
Merged

Uh oh!

Uh oh!

Conversation

chriswailes commented Sep 13, 2022

Uh oh!

rust-highfive commented Sep 13, 2022

Uh oh!

jyn514 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chriswailes commented Sep 14, 2022

Uh oh!

chriswailes commented Sep 14, 2022

Uh oh!

jyn514 commented Sep 14, 2022

Uh oh!

chriswailes commented Sep 14, 2022

Uh oh!

jyn514 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jyn514 commented Sep 14, 2022

Uh oh!

bors commented Sep 14, 2022

Uh oh!

Dylan-DPC commented Sep 15, 2022

Uh oh!

Uh oh!

jyn514 commented Sep 16, 2022

Uh oh!

bors commented Sep 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants