diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-01-24 17:55:13 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-01-24 17:55:13 +0530 |
| commit | e8dea4c092cc563e608c9b918938b97298fbb31c (patch) | |
| tree | 79cbe1d0c2219283730f72ef761a1bc6b5822403 | |
| parent | 29c165b0762705ee2c8ccc0a4011e81e16f6f048 (diff) | |
cerbero: Fix gst-plugins-rs build on MSYS21.22.0
We no longer use MSYS2's pkg-config, so this setting is incorrect and
causes a build failure.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1082>
| -rw-r--r-- | cerbero/ide/pkgconfig.py | 6 |
1 files changed, 1 insertions, 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) |