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

Revert some changes from #51917 to fix custom libdir #52439

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Revert some changes from #51917 to fix custom libdir #52439

merged 1 commit into from
Jul 19, 2018

Conversation

o01eg
Copy link
Contributor

@o01eg o01eg commented Jul 16, 2018

Should fix #52317 also adds libdir value to output.

@XAMPPRocky
Copy link
Member

r? @cramertj

@XAMPPRocky XAMPPRocky added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 16, 2018
@o01eg
Copy link
Contributor Author

o01eg commented Jul 17, 2018

r? @alexcrichton

Could you review this as an author of PR #51917 ?

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 17, 2018

📌 Commit 10b65fa has been approved by alexcrichton

@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 Jul 17, 2018
@o01eg
Copy link
Contributor Author

o01eg commented Jul 18, 2018

What if add test for custom libdir case?

kennytm added a commit to kennytm/rust that referenced this pull request Jul 18, 2018
Revert some changes from rust-lang#51917 to fix custom libdir

Should fix rust-lang#52317 also adds `libdir` value to output.
@alexcrichton
Copy link
Member

It'd be nice yeah! Unfortunately though we don't have a lot of capability to add tests like that to rustbuild, so it's largely untested for now

bors added a commit that referenced this pull request Jul 19, 2018
Rollup of 13 pull requests

Successful merges:

 - #51628 (use checked write in `LineWriter` example)
 - #52116 (Handle array manually in str case conversion methods)
 - #52218 (Amend option.take examples)
 - #52418 (Do not use desugared ident when suggesting adding a type)
 - #52439 (Revert some changes from #51917 to fix custom libdir)
 - #52455 (Fix doc comment: use `?` instead of `.unwrap()`)
 - #52458 (rustc: Fix a suggestion for the `proc_macro` feature)
 - #52464 (Allow clippy to be installed with make install)
 - #52472 (rustc: Enable `use_extern_macros` in 2018 edition)
 - #52477 (Clarify short-circuiting behvaior of Iterator::zip.)
 - #52480 (Cleanup #24958)
 - #52487 (Don't build twice the sanitizers on Linux)
 - #52510 (rustdoc: remove FIXME about macro redirects)

Failed merges:

r? @ghost
@bors bors merged commit 10b65fa into rust-lang:master Jul 19, 2018
@o01eg o01eg deleted the fix-52317 branch July 19, 2018 03:26
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustdoc cann't build rust documentation with custom libdir.
5 participants