Commit 0abd95df authored by Nirbheek Chauhan's avatar Nirbheek Chauhan

cerbero: Fix path to meson binary on 0.48

The meson.py is meson-script.py, but we have meson.exe now so we don't
need to use the script at all.
parent e67a2093
......@@ -492,14 +492,11 @@ class Meson (Build, ModifyEnvBase) :
# Find Meson
if not self.meson_sh:
if self.config.platform == Platform.WINDOWS:
meson = 'meson.py'
else:
meson = 'meson'
# 'Scripts' on Windows and 'bin' on other platforms including MSYS
bindir = sysconfig.get_path('scripts', vars={'base':''}).strip('\\/')
meson_path = os.path.join(self.config.build_tools_prefix, bindir, meson)
self.meson_sh = self.config.python_exe + ' ' + meson_path
# meson installs `meson.exe` on windows and `meson` on other
# platforms that read shebangs
self.meson_sh = os.path.join(self.config.build_tools_prefix, bindir, 'meson')
# Find ninja
if not self.make:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment