Introduce a TargetTriple enum to support absolute target paths by phil-opp · Pull Request #49019 · rust-lang/rust

phil-opp · 2018-03-14T15:52:00Z

This PR replaces target triple strings with a TargetTriple enum, which represents either a target triple or a path to a JSON target file. The path variant is used if the --target argument has a .json extension, else the target triple variant is used.

The motivation of this PR is support for absolute target paths to avoid the need for setting the RUST_TARGET_PATH environment variable (see rust-lang/cargo#4905 for more information). For places where some kind of triple is needed (e.g. in the sysroot folder), we use the file name (without extension).

For compatibility, we keep the old behavior of searching for a file named $(target_triple).json in RUST_TARGET_PATH for non-official target triples.

rust-highfive · 2018-03-14T15:52:15Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (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.

oli-obk · 2018-03-15T10:03:00Z

Travis failure is legit

phil-opp · 2018-03-15T12:44:17Z

Thanks for the hint, I pushed a new version.

pnkfelix · 2018-03-19T14:21:37Z

@bors r+

bors · 2018-03-19T14:21:38Z

📌 Commit 4b16597 has been approved by pnkfelix

phil-opp · 2018-03-22T12:24:53Z

@pnkfelix I added a commit that appends a hash of the target path when a TargetPath is converted to a triple. This avoids collisions when two target files in different folders are named identically. It also allows to differentiate targets with the same name in error messages. For example:

error[E0461]: couldn't find crate `core` with expected target triple stm32f7-11703095894775286769
|
= note: the following crate versions were found:
crate `core`, target triple stm32f7-10929095608748322303

phil-opp · 2018-03-22T13:33:05Z

Rebased and fixed some target triple uses introduced by other PRs.

bors · 2018-03-23T21:50:31Z

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

phil-opp · 2018-03-24T19:25:37Z

Rebased

Add support for absolute target.json paths Builds upon rust-lang/rust#49019 with the goal to provide a solution to #4905. This PR does two things: ~~1. It appends a hash of the target path to the target folder name if a `*.json` path is passed as `--target`, like it's done in rust-lang/rust#49019. This helps differentiating targets with the same JSON file name and avoids sysroot clashes in `xargo`.~~ See #5228 (comment) 2. It canonicalizes the passed target path (if it's a `*.json` path), so that the path stays valid when building dependencies and setting the `RUST_TARGET_PATH` environment variable is no longer necessary.

pnkfelix · 2018-03-28T11:20:46Z

@bors r+

bors · 2018-03-28T11:20:47Z

📌 Commit b889f98 has been approved by pnkfelix

bors · 2018-03-28T12:56:16Z

⌛ Testing commit b889f98 with merge d87c19d...

Introduce a TargetTriple enum to support absolute target paths This PR replaces target triple strings with a `TargetTriple` enum, which represents either a target triple or a path to a JSON target file. The path variant is used if the `--target` argument has a `.json` extension, else the target triple variant is used. The motivation of this PR is support for absolute target paths to avoid the need for setting the `RUST_TARGET_PATH` environment variable (see rust-lang/cargo#4905 for more information). For places where some kind of triple is needed (e.g. in the sysroot folder), we use the file name (without extension). For compatibility, we keep the old behavior of searching for a file named `$(target_triple).json` in `RUST_TARGET_PATH` for non-official target triples.

bors · 2018-03-28T15:31:26Z

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing d87c19d to master...

rust-highfive assigned pnkfelix Mar 14, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2018

phil-opp force-pushed the target-spec branch from 847bf25 to e851628Compare March 14, 2018 21:05

phil-opp force-pushed the target-spec branch from e851628 to 4b16597Compare March 15, 2018 12:02

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 Mar 19, 2018

phil-opp force-pushed the target-spec branch from 2003295 to 64bcea9Compare March 22, 2018 13:32

This was referenced Mar 22, 2018
Add support for absolute target.json paths rust-lang/cargo#5228
Merged
Support absolute target JSON paths japaric/xargo#205
Closed
Switching cwd breaks usage of custom target specifications rust-lang/cargo#4905
Open

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 23, 2018

phil-opp force-pushed the target-spec branch from 5253457 to 65dbae8Compare March 24, 2018 19:24

phil-opp force-pushed the target-spec branch from 4c45766 to eff8e7bCompare March 25, 2018 11:40

phil-opp added 3 commits March 26, 2018 18:57

Introduce a TargetTriple enum to support absolute target paths
3908b2e

Canonicalize paths
7b49190

Add a hash when a TargetPath is displayed
b889f98

phil-opp force-pushed the target-spec branch from eff8e7b to b889f98Compare March 26, 2018 17:22

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 Mar 28, 2018

bors merged commit b889f98 into rust-lang:masterMar 28, 2018

This was referenced Mar 28, 2018
Take the original extra-filename passed to a crate into account when resolving it as a dependency #49253
Merged
rustc: Group linked libraries where needed #49316
Merged

phil-opp deleted the target-spec branch March 28, 2018 15:57

phil-opp mentioned this pull request May 7, 2018
No more RUST_TARGET_PATH phil-opp/blog_os#431
Merged

ehuss mentioned this pull request Jul 20, 2019
Target specification? rust-lang/wg-cargo-std-aware#6
Closed

Mark-Simulacrum mentioned this pull request Apr 10, 2020
De-stabilize target spec JSON #71009
Closed

ehuss mentioned this pull request Jan 23, 2026
Tracking Issue for target-spec-json (flexible target specifications) #151528
Open
4 tasks

Uh oh!

Uh oh!

Conversation

phil-opp commented Mar 14, 2018

Uh oh!

rust-highfive commented Mar 14, 2018

Uh oh!

oli-obk commented Mar 15, 2018

Uh oh!

phil-opp commented Mar 15, 2018

Uh oh!

pnkfelix commented Mar 19, 2018

Uh oh!

bors commented Mar 19, 2018

Uh oh!

phil-opp commented Mar 22, 2018

Uh oh!

phil-opp commented Mar 22, 2018

Uh oh!

bors commented Mar 23, 2018

Uh oh!

phil-opp commented Mar 24, 2018

Uh oh!

pnkfelix commented Mar 28, 2018

Uh oh!

bors commented Mar 28, 2018

Uh oh!

bors commented Mar 28, 2018

Uh oh!

bors commented Mar 28, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants