Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix autootoolstoolchain "rc" compiler #15946

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Fix autootoolstoolchain "rc" compiler #15946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conan/tools/gnu/autotoolstoolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def environment(self):
compilers_by_conf = self._conanfile.conf.get("tools.build:compiler_executables", default={},
check_type=dict)
if compilers_by_conf:
compilers_mapping = {"c": "CC", "cpp": "CXX", "cuda": "NVCC", "fortran": "FC"}
compilers_mapping = {"c": "CC", "cpp": "CXX", "cuda": "NVCC", "fortran": "FC", "rc": "RC"}
for comp, env_var in compilers_mapping.items():
if comp in compilers_by_conf:
compiler = compilers_by_conf[comp]
Expand Down
3 changes: 2 additions & 1 deletion conans/test/integration/toolchains/gnu/test_autotoolstoolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def test_toolchain_and_compilers_build_context():
os=Linux

[conf]
tools.build:compiler_executables={"c": "gcc", "cpp": "g++"}
tools.build:compiler_executables={"c": "gcc", "cpp": "g++", "rc": "windres"}
""")
build = textwrap.dedent("""
[settings]
Expand Down Expand Up @@ -265,6 +265,7 @@ def build(self):
content = load(self, toolchain)
assert 'export CC="gcc"' in content
assert 'export CXX="g++"' in content
assert 'export RC="windres"' in content
franramirez688 marked this conversation as resolved.
Show resolved Hide resolved
""")
client = TestClient()
client.save({
Expand Down