Adding support for ar and ld variables on cmake-toolchain
#16541
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
memsharded
reviewed
Jul 1, 2024
| @@ -865,7 +871,9 @@ def context(self): | |||
| # To set CMAKE_<LANG>_COMPILER | |||
| if comp in compilers_by_conf: | |||
| compilers[lang] = compilers_by_conf[comp] | |||
| return {"compilers": compilers} | |||
| return {"compilers": compilers, | |||
| "cmake_ar": compilers_by_conf["ar"] if "ar" in compilers_by_conf else None, | |||
There was a problem hiding this comment.
Isn't it enough compilers_by_conf.get("ar")?
| @@ -289,12 +289,12 @@ def __init__(self, conanfile, backend=None, native=False): | |||
| # PR related: https://github.com/mesonbuild/meson/pull/6457 | |||
| #: Defines the Meson ``c_ld`` variable. Defaulted to ``CC_LD`` | |||
| #: environment value | |||
| self.c_ld = build_env.get("CC_LD") | |||
| self.c_ld = compilers_by_conf.get("ld") or self._sanitize_env_format(build_env.get("CC_LD")) | |||
There was a problem hiding this comment.
Might need to update the PR title and changelog if this affects Meson too
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.
Changelog: Fix: Fix ar and ld flags for cmake toolchain
Docs: https://github.com/conan-io/docs/pull/XXXX
Close: #16517
CMAKE__LINK_EXECUTABLE
CMAKE_AR