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: stop trashing (DY)LD_LIBRARY_PATH #39950

Merged
merged 1 commit into from
Feb 25, 2017

Conversation

ishitatsuyuki
Copy link
Contributor

This generated an ugly error with fakeroot before.

@rust-highfive
Copy link
Collaborator

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@nagisa
Copy link
Member

nagisa commented Feb 19, 2017

Should not commit submodule changes.

This generated an ugly error with fakeroot before.
@ishitatsuyuki
Copy link
Contributor Author

Fixed.

(os.pathsep + env["LD_LIBRARY_PATH"]) \
if "LD_LIBRARY_PATH" in env else ""
env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
(os.pathsep + env["DYLD_LIBRARY_PATH"]) \
Copy link
Contributor

Choose a reason for hiding this comment

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

Is os.pathsep the correct separator here? According to the dyld manpage the paths are separated by ':' (and IIRC the same holds for LD_LIBRARY_PATH, too)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

According to docs:

The character conventionally used by the operating system to separate search path components (as in PATH), such as ':' for POSIX or ';' for Windows.

This variable is POSIX only anyway, so it works as intended.

@ishitatsuyuki
Copy link
Contributor Author

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 21, 2017

📌 Commit df28569 has been approved by alexcrichton

eddyb added a commit to eddyb/rust that referenced this pull request Feb 25, 2017
… r=alexcrichton

bootstrap: stop trashing (DY)LD_LIBRARY_PATH

This generated an ugly error with fakeroot before.
eddyb added a commit to eddyb/rust that referenced this pull request Feb 25, 2017
… r=alexcrichton

bootstrap: stop trashing (DY)LD_LIBRARY_PATH

This generated an ugly error with fakeroot before.
bors added a commit that referenced this pull request Feb 25, 2017
@bors bors merged commit df28569 into rust-lang:master Feb 25, 2017
@ishitatsuyuki ishitatsuyuki deleted the stop-trashing-ldpath branch March 4, 2017 03:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants