Skip to content

Conversation

@semarie
Copy link
Contributor

@semarie semarie commented Aug 6, 2017

it makes platforms without (or partial) rpath support to be able to run
rustdoc binary.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@semarie
Copy link
Contributor Author

semarie commented Aug 6, 2017

the build of nightly currently fail for OpenBSD.

please note I am unsure that src/bootstrap/bin/rustdoc.rs is the right place to correct the problem.

tracing it, I found that when rustdoc was called, the LD_LIBRARY_PATH coming empty. Explictly adding it in bootstrap-rustdoc binary makes it to work again.

@semarie
Copy link
Contributor Author

semarie commented Aug 6, 2017

@Mark-Simulacrum I saw you made some refactor regarding src/tools/rustdoc. Does this problem remind you something ? or do you know a better way to resolv it ?

@Mark-Simulacrum
Copy link
Member

I think the right fix here is actually to make https://github.com/rust-lang/rust/blob/master/src/bootstrap/builder.rs#L430 be a call to rustc_libdir instead of sysroot_libdir, since that's what we do when invoking Cargo. Could you make that change instead, and see if it works on your platform? Thanks!

@Mark-Simulacrum
Copy link
Member

Ah, I'll also reassign to review on me, though if I'm unresponsive, @alexcrichton is a good alternative.

@semarie
Copy link
Contributor Author

semarie commented Aug 8, 2017

@Mark-Simulacrum yes it works well with the proposed change. I updated the PR. Thanks.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 8, 2017

📌 Commit c982d6a has been approved by Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Aug 8, 2017

⌛ Testing commit c982d6a with merge bcd75d6...

bors added a commit that referenced this pull request Aug 8, 2017
explicitly add SYSROOT/lib directory to dylib var

it makes platforms without (or partial) rpath support to be able to run
rustdoc binary.
@arielb1 arielb1 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 8, 2017
@bors
Copy link
Collaborator

bors commented Aug 8, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing bcd75d6 to master...

@bors bors merged commit c982d6a into rust-lang:master Aug 8, 2017
@semarie semarie deleted the rustdoc-ldpath branch August 8, 2017 15:10
o01eg added a commit to o01eg/gentoo-rust that referenced this pull request Aug 8, 2017
Cynede added a commit to gentoo/gentoo-rust that referenced this pull request Aug 8, 2017
vivo75 pushed a commit to vivo75/vivovl that referenced this pull request Sep 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants