diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2023-03-26 02:44:47 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-03-28 23:24:13 -0400 |
| commit | 81c3c3808e611adeda204891f7f14228fc51efee (patch) | |
| tree | 25c619bbf9dbe2d9099568a9978d629f2fbb14fb | |
| parent | 9d98b4cb840e692808a89f7c6f193215ae37f4b8 (diff) | |
| download | meson-81c3c3808e611adeda204891f7f14228fc51efee.zip meson-81c3c3808e611adeda204891f7f14228fc51efee.tar.gz meson-81c3c3808e611adeda204891f7f14228fc51efee.tar.bz2 | |
python dependency: avoid redefinition warnings for MS_WIN64
pyconfig.h defines it in limited cases, but as empty, rather than as "1"
which is what command-line defines generally do. Explicitly define it as
a compatible definition so the compiler does not log a warning that the
value has changed.
Fixes #11592
| -rw-r--r-- | mesonbuild/dependencies/python.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py index eaa9067..14386f9 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py @@ -209,7 +209,7 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): # https://sourceforge.net/p/mingw-w64/mailman/message/30504611/ # https://github.com/python/cpython/pull/100137 if mesonlib.is_windows() and self.get_windows_python_arch() == '64' and mesonlib.version_compare(self.version, '<3.12'): - self.compile_args += ['-DMS_WIN64'] + self.compile_args += ['-DMS_WIN64='] if not self.clib_compiler.has_header('Python.h', '', environment, extra_args=self.compile_args): self.is_found = False |