dyndep: reconcile dyndep-specified outputs with depfile-specified inputs #1937
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously this was covered only as part of more complex tests.
When a path loaded from a depfile does not have a node, we create a new node with a phony edge producing it. If we later load a dyndep file that specifies the same node as an output of a known edge, we previously failed with a "multiple rules generate ..." error. Instead, since the conflicting edge was internally generated, replace the node's input edge with the now-known real edge that produces it.
bradking
force-pushed
the
dyndep-out-depfile-in
branch
from
6f706d2 to
fa577b6
Compare
|
Thanks! Will this fix https://gitlab.kitware.com/cmake/cmake/-/issues/20025 ? |
|
CMake Issue 20025 needs this change, but will also need changes to CMake to use this combination of features. The case in that issue has build-time-discovered outputs of the |
kwrobot
pushed a commit
to Kitware/CMake
that referenced
this pull request
Jan 24, 2023
kwrobot
pushed a commit
to Kitware/CMake
that referenced
this pull request
Jan 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a path loaded from a depfile does not have a node, we create a new node with a phony edge producing it. If we later load a dyndep file that specifies the same node as an output of a known edge, we previously failed with a "multiple rules generate ..." error. Instead, since the conflicting edge was internally generated, replace the node's input edge with the now-known real edge that produces it.
While at it, add a dedicated test for dyndep-discovered implicit dependencies. Previously this was covered only as part of more complex tests.