Skip to content

Commit

Permalink
Fix autootoolstoolchain "rc" compiler (#15946)
Browse files Browse the repository at this point in the history
wip
  • Loading branch information
memsharded committed Mar 27, 2024
1 parent dc9d971 commit d9c3fb7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conan/tools/gnu/autotoolstoolchain.py
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
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
""")
client = TestClient()
client.save({
Expand Down

0 comments on commit d9c3fb7

Please sign in to comment.