Skip to content

Fix setting PATH during linkage on windows-gnu - #42481

Merged
bors merged 1 commit into
rust-lang:masterfrom
brson:wingnu
Jun 8, 2017
Merged

Fix setting PATH during linkage on windows-gnu#42481
bors merged 1 commit into
rust-lang:masterfrom
brson:wingnu

Conversation

@brson

@brsonbrson commented Jun 6, 2017

Copy link
Copy Markdown
Contributor

This makes the behavior almost exactly the same as before the VS2017 patch, except that on MSVC builds the host bin path is no longer added to PATH. I am not sure that's actually necessary on any platform.

r? @alexcrichton

Fixes#42422

@brsonbrson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 6, 2017
@brson

brson commented Jun 6, 2017

Copy link
Copy Markdown
ContributorAuthor

Oh actually I miststated - this is not like previously, now this is only frobbing PATH at all for linker invocation on windows, whereas before it was doing it on all platforms. Again we think it only matters on windows.

ollie27
ollie27 reviewed Jun 6, 2017
View reviewed changes
Comment threadsrc/librustc_trans/back/link.rs Outdated

@ollie27ollie27Jun 6, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This doesn't seem right. The second parameter to command_path is added to the end of %Path% and before #42225 it was only used by MSVC.

@brsonbrsonJun 6, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah yes. I suspected that path had no effect. I'll update.

@brson

brson commented Jun 6, 2017

Copy link
Copy Markdown
ContributorAuthor

Ok, now the patch is written so that all non-msvc platforms set up the PATH during linking as previously. The command_path function only takes one argument now.

@alexcrichtonalexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 7, 2017
@alexcrichton

alexcrichton commented Jun 7, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jun 7, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e8689c7 has been approved by alexcrichton

@aidanhsaidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 7, 2017
@bors

bors commented Jun 8, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e8689c7 with merge 76eea74...

bors added a commit that referenced this pull request Jun 8, 2017
@bors
Auto merge of#42481- brson:wingnu, r=alexcrichton
76eea74
Fix setting PATH during linkage on windows-gnu
This makes the behavior almost exactly the same as before the VS2017 patch, except that on MSVC builds the host bin path is no longer added to PATH. I am not sure that's actually necessary on any platform.
r? @alexcrichtonFixes#42422
@bors

bors commented Jun 8, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 76eea74 to master...

@bors
bors merged commit e8689c7 into rust-lang:masterJun 8, 2017
@CryZeCryZe mentioned this pull request Jun 9, 2017
Merged
@brsonbrson mentioned this pull request Jun 12, 2017
Merged
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 12, 2017
bors added a commit that referenced this pull request Jun 12, 2017
@bors
Auto merge of#42567- CryZe:beta-wingnu, r=alexcrichton
0cd6b0d
[beta] Fix setting PATH during linkage on windows-gnu
Beta backport of #42481
bors added a commit that referenced this pull request Jun 15, 2017
@bors
Auto merge of#42609- brson:beta-next, r=alexcrichton
a175ee5
Beta next
- #42521
- #42512
- #42482
- #42481
- #42480
r? @nikomatsakis remember to untag 'beta-nominated' on linked issues
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@ollie27ollie27ollie27 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@alexcrichtonalexcrichton

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@brson@alexcrichton@bors@ollie27@aidanhs