Thanks to visit codestin.com
Credit goes to github.com

Skip to content

modules/windows: Also search for llvm-rc and llvm-windres #15017

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modules/windows: Also search for llvm-rc and llvm-windres #15017

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
modules/windows: Also search for llvm-rc and llvm-windres 
Fixes #15011
  • Loading branch information
@lb90
lb90 committed Sep 10, 2025
commit 0fad6002a90ddcba9ad854e01f917c743cbf75e4
20 changes: 16 additions & 4 deletions mesonbuild/modules/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,26 @@ def _find_resource_compiler(self, state: 'ModuleState') -> T.Tuple[ExternalProgr
rescomp = ExternalProgram.from_bin_list(state.environment, for_machine, 'windres')

if not rescomp or not rescomp.found():
def search_programs(names: T.List[str]) -> T.Optional[ExternalProgram]:
for name in names:
program = ExternalProgram(name, silent=True)
if program.found():
return program
return None

def find_rc_like_compiler() -> T.Optional[ExternalProgram]:
return search_programs(['rc', 'llvm-rc'])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function exists solely to be an alias for another function. I don't think you need the extra function definition...


def find_windres_like_compiler() -> T.Optional[ExternalProgram]:
return search_programs(['windres', 'llvm-windres'])

comp = self.detect_compiler(state.environment.coredata.compilers[for_machine])
if comp.id in {'msvc', 'clang-cl', 'intel-cl'} or (comp.linker and comp.linker.id in {'link', 'lld-link'}):
# Microsoft compilers uses rc irrespective of the frontend
rescomp = ExternalProgram('rc', silent=True)
rescomp = find_rc_like_compiler() or find_windres_like_compiler()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit message doesn't rationalize why for MSVC/clang-cl we now search for windres

else:
rescomp = ExternalProgram('windres', silent=True)
rescomp = find_windres_like_compiler() or find_rc_like_compiler()

if not rescomp.found():
if not rescomp:
raise MesonException('Could not find Windows resource compiler')

for (arg, match, rc_type) in [
Expand Down
Loading