Skip to content

gnome: avoid backslashes on Windows when setting CC for g-ir-scanner #15387

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
lazka wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −0
Open

gnome: avoid backslashes on Windows when setting CC for g-ir-scanner #15387

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
5 changes: 5 additions & 0 deletions mesonbuild/modules/gnome.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import copy
import itertools
import pathlib
import functools
import os
import subprocess
Expand Down Expand Up @@ -994,6 +995,10 @@ def _make_gir_target(
run_env = PkgConfigInterface.get_env(state.environment, MachineChoice.HOST, uninstalled=True)
# g-ir-scanner uses Python's distutils to find the compiler, which uses 'CC'
cc_exelist = state.environment.coredata.compilers.host['c'].get_exelist()
# g-ir-scanner uses distutils/setuptools which splits CC with both Posix
# and Windows rules to get the first argument, which breaks if there are
# backslashes, so best avoid them entirely.
cc_exelist = [pathlib.Path(exe).as_posix() for exe in cc_exelist]
run_env.set('CC', [quote_arg(x) for x in cc_exelist], ' ')
run_env.set('CFLAGS', [quote_arg(x) for x in env_flags], ' ')
run_env.merge(kwargs['env'])
Expand Down
Loading