meson/configure_make: avoid resetting toolchain vars#1508
Draft
meson/configure_make: avoid resetting toolchain vars#1508
Conversation
if the target wants to override the value of a toolchain variable via env input, allow that, and don't overwrite it. This is useful for, for example, preventing the meson fallback to cmake. These values are already set in cc_external_rule_impl via the tools_data (which loads tool.env from the toolchains themselves), however, since meson has always used the path as the primary determinant for these values, just move the assignment from the path up a bit so it's before the user assignment overrides.
novas0x2a
force-pushed
the
cmake-generators-meson
branch
from
c7d844c to
4aae982
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 the target wants to override the value of a toolchain variable via env input, allow that, and don't overwrite it. This is useful for, for example, preventing the meson fallback to cmake.
These values are already set in cc_external_rule_impl via the tools_data (which loads tool.env from the toolchains themselves), however, since meson has always used the path as the primary determinant for these values, just move the assignment from the path up a bit so it's before the user assignment overrides.
Handle MAKE for autotools similarly. Note that it's not actually a hard requirement that the toolchains set their primary variable;
preinstalled_makesets path but notMAKE. This is probably a bug, but it's a much larger overhaul to make sure we can trust the toolchain vars.