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

Symlink build/host -> build/$HOST_TRIPLE #104854

Merged
merged 1 commit into from
Dec 18, 2022
Merged

Symlink build/host -> build/$HOST_TRIPLE #104854

merged 1 commit into from
Dec 18, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Nov 25, 2022

(as appropriate per target)

This allows us to use a consistent path in the documentation, without having to worry about which platform people are using.

@rustbot
Copy link
Collaborator

rustbot commented Nov 25, 2022

r? @Mark-Simulacrum

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

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 25, 2022
@jyn514 jyn514 mentioned this pull request Nov 25, 2022
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid
Copy link
Member

camelid commented Nov 26, 2022

Might it be clearer to replace the linux target triple in the title with $HOST or something similar? Otherwise it's a bit confusing.

@jyn514 jyn514 changed the title Symlink build/host -> build/x86_64-unknown-linux-gnu Symlink build/host -> build/$HOST Nov 26, 2022
@jyn514 jyn514 changed the title Symlink build/host -> build/$HOST Symlink build/host -> build/$HOST_TRIPLE Nov 26, 2022
@Mark-Simulacrum
Copy link
Member

I feel like "host" here is a bit confusing -- it's the build triple, not the host (of which there can be multiple).

I can't say I have better names though and in practice host is ~nearly right so maybe we should just not worry about this.

r=me if you don't have any different ideas.

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2022
@bors
Copy link
Contributor

bors commented Dec 6, 2022

☔ The latest upstream changes (presumably #105328) made this pull request unmergeable. Please resolve the merge conflicts.

@camelid
Copy link
Member

camelid commented Dec 7, 2022

I feel like "host" here is a bit confusing -- it's the build triple, not the host (of which there can be multiple).

Just to clarify, are you talking about there being multiple directories in the case of cross-compilation? In that case, I would assume this PR only symlinks to the host's corresponding build directory. (Apologies if I misunderstood.)

@Mark-Simulacrum
Copy link
Member

Yes, when cross-compiling. I'm not sure we require that the build platform is one of the host platforms.

@jyn514
Copy link
Member Author

jyn514 commented Dec 7, 2022

@Mark-Simulacrum how does build_triple sound?

@Mark-Simulacrum
Copy link
Member

Not opposed, though I can't call myself enthusiastic about it either :)

@jyn514
Copy link
Member Author

jyn514 commented Dec 17, 2022

I think I'm going to keep it as host. Having a host that doesn't match build is very rare, and build is too ambiguous to be clear, even when using build_triple. People can always use ls -l build/host to see what target is actually being used.

@jyn514
Symlink build/host -> build/x86_64-unknown-linux-gnu (as appropri…
6f0fc2f 
…ate per target)

This allows us to use a consistent path in the documentation, without having to worry about which platform people are using.
@jyn514
Copy link
Member Author

jyn514 commented Dec 17, 2022

@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Dec 17, 2022

📌 Commit 6f0fc2f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 17, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 17, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 17, 2022
@bors
Auto merge of rust-lang#105849 - matthiaskrgr:rollup-ya4s1n2, r=matth…
24368ec 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#104854 (Symlink `build/host` -> `build/$HOST_TRIPLE`)
 - rust-lang#105458 (Allow blocking `Command::output`)
 - rust-lang#105559 (bootstrap: Allow installing `llvm-tools`)
 - rust-lang#105789 (rustdoc: clean up margin CSS for scraped examples)
 - rust-lang#105792 (docs: add long error explanation for error E0320)
 - rust-lang#105814 (Support call and drop terminators in custom mir)
 - rust-lang#105829 (Speed up tidy)
 - rust-lang#105836 (std::fmt: Use args directly in example code)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5dc0b6f into rust-lang:master Dec 18, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 18, 2022
@jyn514 jyn514 deleted the sysroot-symlink branch January 1, 2023 00:23
@arlosi arlosi mentioned this pull request Mar 24, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.
6 participants
@jyn514 @rustbot @rust-log-analyzer @camelid @Mark-Simulacrum @bors