Commit e112004d authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

cerbero: Look for build tools in the right PATH

Otherwise none of the toolchain build tools will actually be found.
Only the ones provided by MSYS will be found.

Part-of: <gstreamer/cerbero!480>
parent 9cfb4675
......@@ -875,6 +875,7 @@ class Meson (Build, ModifyEnvBase) :
binaries['moc'] = [self._get_moc_path(self.config.qt5_qmake_path)]
# Try to detect build tools in the remaining env vars
build_tool_paths = build_env['PATH'].get()
for name, tool in build_env.items():
# Autoconf env vars, incorrectly detected as a build tool because of 'yes'
if name.startswith('ac_cv'):
......@@ -882,7 +883,7 @@ class Meson (Build, ModifyEnvBase) :
# Files are always executable on Windows
if name in ('HISTFILE', 'GST_REGISTRY_1_0'):
continue
if tool and shutil.which(tool[0]):
if tool and shutil.which(tool[0], path=build_tool_paths):
binaries[name.lower()] = tool
extra_properties = ''
......
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