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.

Sign up for GitHub

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

Jump to bottom

bootstrap: Configurable musl libdir #73456

Merged
merged 1 commit into from
Jun 30, 2020
Merged

bootstrap: Configurable musl libdir #73456

merged 1 commit into from
Jun 30, 2020

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Jun 17, 2020

Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.

@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 @Mark-Simulacrum (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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 17, 2020
Mark-Simulacrum
Mark-Simulacrum reviewed Jun 18, 2020
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

Seems good to merge, left one nit.

config.toml.example Outdated
# linked binaries
#musl-root = "..."

# The location of musl libdir.
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a note here that the location should include the musl-root as well? Alternatively, I'm not sure if we should actually require that -- maybe we should prepend the root instead? Is it typical to have the libdir outside the root?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mentioned that this is a full path. The idea was that this should be the same as ./configure --libdir=... used with musl.

@tmiasko
bootstrap: Configurable musl libdir
5c20ef4 
Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 25, 2020

📌 Commit 5c20ef4 has been approved by Mark-Simulacrum

@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 Jun 25, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 26, 2020
@Manishearth
Rollup merge of rust-lang#73456 - tmiasko:musl-libdir, r=Mark-Simulacrum
442e9c8 
bootstrap: Configurable musl libdir

Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.
@Manishearth Manishearth mentioned this pull request Jun 26, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 26, 2020
@Manishearth
Rollup merge of rust-lang#73456 - tmiasko:musl-libdir, r=Mark-Simulacrum
5018922 
bootstrap: Configurable musl libdir

Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.
@Manishearth Manishearth mentioned this pull request Jun 26, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 26, 2020
@Manishearth
Rollup merge of rust-lang#73456 - tmiasko:musl-libdir, r=Mark-Simulacrum
eca643d 
bootstrap: Configurable musl libdir

Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.
@Manishearth Manishearth mentioned this pull request Jun 26, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 27, 2020
@Manishearth
Rollup merge of rust-lang#73456 - tmiasko:musl-libdir, r=Mark-Simulacrum
73ef79b 
bootstrap: Configurable musl libdir

Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.
@Manishearth Manishearth mentioned this pull request Jun 27, 2020
Closed
@bors
Copy link
Contributor

bors commented Jun 28, 2020

⌛ Testing commit 5c20ef4 with merge cb54963ae83956ee7b60e7a30d7b7c934c70808f...

@bors
Copy link
Contributor

bors commented Jun 28, 2020

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 28, 2020
@Mark-Simulacrum
Copy link
Member

@bors retry

I'm going to presume this is spurious, I can't imagine a timeout caused by this PR.

@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 Jun 28, 2020
@Manishearth Manishearth mentioned this pull request Jun 29, 2020
Closed
@tmiasko
Copy link
Contributor Author

tmiasko commented Jun 29, 2020

This should be safe to include in a rollup.

Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 29, 2020
@Manishearth
Rollup merge of rust-lang#73456 - tmiasko:musl-libdir, r=Mark-Simulacrum
db95513 
bootstrap: Configurable musl libdir

Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.
@Manishearth Manishearth mentioned this pull request Jun 29, 2020
Closed
@bors
Copy link
Contributor

bors commented Jun 30, 2020

⌛ Testing commit 5c20ef4 with merge 16957bd...

@bors
Copy link
Contributor

bors commented Jun 30, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 16957bd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 30, 2020
@bors bors merged commit 16957bd into rust-lang:master Jun 30, 2020
@tmiasko tmiasko deleted the musl-libdir branch June 30, 2020 20:00
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.
5 participants
@tmiasko @rust-highfive @Mark-Simulacrum @bors @cuviper