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

[beta] Partially revert dep changes in #5651 #5722

Merged
merged 1 commit into from
Jul 13, 2018

Conversation

alexcrichton
Copy link
Member

This is a beta backport of #5711

Some logic which was tweaked around the dependencies of build script targets was
tweaked slightly in a way that causes cargo to stack overflow by accientally
adding a dependency loop. This commit implements one of the strategies discussed
in rust-lang#5711 to fix this situation.

The problem here is that when calculating the deps of a build script we need the
build scripts of *other* packages, but the exact profile is somewhat difficult
to guess at the moment we're generating our build script unit. To solve this the
dependencies towards other build scripts' executions is added in a different
pass after all other units have been assembled. At this point we should know for
sure that all build script executions are in the dependency graph, and we just
need to add a few more edges.

Closes rust-lang#5708
@rust-highfive
Copy link

r? @matklad

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

@rust-highfive
Copy link

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.28.0. Please double check that you specified the right target!

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Jul 13, 2018

📌 Commit bb9ff3d has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jul 13, 2018

⌛ Testing commit bb9ff3d with merge fed584a620ed88eb7fb09434fcbe371f73e8e2b4...

@bors
Copy link
Collaborator

bors commented Jul 13, 2018

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Jul 13, 2018

⌛ Testing commit bb9ff3d with merge 96a2c7d...

bors added a commit that referenced this pull request Jul 13, 2018
[beta] Partially revert dep changes in #5651

This is a beta backport of #5711
@bors
Copy link
Collaborator

bors commented Jul 13, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 96a2c7d to rust-1.28.0...

@bors bors merged commit bb9ff3d into rust-lang:rust-1.28.0 Jul 13, 2018
@alexcrichton alexcrichton deleted the beta-next branch July 18, 2018 15:56
ehuss added a commit to ehuss/rust that referenced this pull request Jul 18, 2018
- [beta] Partially revert dep changes in rust-lang/cargo#5651 (rust-lang/cargo#5722)
bors added a commit to rust-lang/rust that referenced this pull request Jul 19, 2018
[BETA] Update cargo

- [beta] Partially revert dep changes in rust-lang/cargo#5651 (rust-lang/cargo#5722)
moshg pushed a commit to moshg/rust-std-ja that referenced this pull request Apr 4, 2020
- [beta] Partially revert dep changes in rust-lang/cargo#5651 (rust-lang/cargo#5722)
moshg pushed a commit to moshg/rust-std-ja that referenced this pull request Apr 4, 2020
@ehuss ehuss added this to the 1.28.0 milestone Feb 6, 2022
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.

None yet

5 participants