Update find runfiles manifest file logic #12650
Closed
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.
This pull request updates the
FindManifestFileImpl
function to look for the runfiles manifest file of the binary first. If it is not found, it can use the manifest file specified in the environment variablesRUNFILES_MANIFEST_FILE
if it exists. The same logic is applied inrunfiles_src.cc
to find runfiles manifest file / directory of cc binaries.This is done to avoid using the manifest file in
RUNFILES_MANIFEST_FILE
environment variable if the binary already has its own runfiles manifest file. While, at the same time, allow using the value in the environment variables for binaries run as data-dependency that have no runfiles manifest/directory and should use the main binary's.Fixes: #10598