uninstalled: Fix meson detection when using meson from a git checkout
This would not trigger on the build bot because there is special casing in the code for a meson checkout underneath gst-build. Fix needed as mesonintrospect.py was changed into 'meson.py introspect' in recent meson versions. When using meson from git to configure the build the uninstalled script would pick up a system meson instead which then would then error out parsing the coredata from the newer meson.
This commit is contained in:
parent
3942dc262b
commit
62f1739133
@ -67,7 +67,7 @@ def get_meson():
|
|||||||
continue
|
continue
|
||||||
if os.path.exists (comp):
|
if os.path.exists (comp):
|
||||||
mesondir = os.path.dirname(comp)
|
mesondir = os.path.dirname(comp)
|
||||||
if mesonintrospect.endswith('.py'):
|
if mesonintrospect.endswith('.py') or mesonintrospect.endswith('.py introspect'):
|
||||||
meson = os.path.join(mesondir, 'meson.py')
|
meson = os.path.join(mesondir, 'meson.py')
|
||||||
else:
|
else:
|
||||||
meson = os.path.join(mesondir, 'meson')
|
meson = os.path.join(mesondir, 'meson')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user