From e8dea4c092cc563e608c9b918938b97298fbb31c Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 24 Jan 2023 17:55:13 +0530 Subject: cerbero: Fix gst-plugins-rs build on MSYS2 We no longer use MSYS2's pkg-config, so this setting is incorrect and causes a build failure. Part-of: --- cerbero/ide/pkgconfig.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cerbero/ide/pkgconfig.py b/cerbero/ide/pkgconfig.py index c12716f2..e8c22e14 100644 --- a/cerbero/ide/pkgconfig.py +++ b/cerbero/ide/pkgconfig.py @@ -105,10 +105,6 @@ class PkgConfig(object): @staticmethod def set_executable(env, config): - if config.distro == Distro.MSYS2: - # We use pkg-config installed with pacman - env['PKG_CONFIG'] = "/ucrt64/bin/pkg-config" - return env['PKG_CONFIG'] = os.path.join(config.build_tools_prefix, 'bin', 'pkg-config') def _remove_deps(self, func, all_values): @@ -143,4 +139,4 @@ class PkgConfig(object): env_paths = env.get(var, None) if env_paths is not None: dirs += env_paths.split(separator) - env[var] = separator.join(dirs) \ No newline at end of file + env[var] = separator.join(dirs) -- cgit v1.2.3