respect the machine file binary overrides, even if it doesn't exist #11372
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
If someone specifies a binary in a machine file, but the resulting prog.found() is false because it doesn't actually exist on disk, then the user was probably trying to disable finding that program. But find_program() currently doesn't distinguish between a machine file lookup returning a not-found program, and returning a dummy program because there's no entry at all. Explicitly check for a dummy program, rather than checking if the program was found, before deciding whether to discard the lookup results and continue trying other program lookup methods.
dcbaker
approved these changes
Feb 10, 2023
Codecov Report
@@ Coverage Diff @@
## master #11372 +/- ##
==========================================
- Coverage 67.04% 67.03% -0.02%
==========================================
Files 414 414
Lines 90542 90542
Branches 20096 20096
==========================================
- Hits 60703 60691 -12
- Misses 25177 25184 +7
- Partials 4662 4667 +5
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
gentoo-bot
pushed a commit
to gentoo/gentoo
that referenced
this pull request
Feb 10, 2023
Thanks to Eli Schwartz for getting things to the point where we could do this (a Meson bug fix [0] for the native override for find_program and a zstd change [1] for letting us build tests but not install programs for multilib). [0] mesonbuild/meson#11372 [1] facebook/zstd#3490 Signed-off-by: Sam James <sam@gentoo.org>
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.
If someone specifies a binary in a machine file, but the resulting prog.found() is false because it doesn't actually exist on disk, then the user was probably trying to disable finding that program. But find_program() currently doesn't distinguish between a machine file lookup returning a not-found program, and returning a dummy program because there's no entry at all.
Explicitly check for a dummy program, rather than checking if the program was found, before deciding whether to discard the lookup results and continue trying other program lookup methods.
/cc @thesamesam here you go