diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-28 18:30:13 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-30 14:13:11 +0530 |
| commit | daecc6c01659ab3ece00a33aff725db771c4a6af (patch) | |
| tree | 2fdad72ce768f2e5037ac0e7bc75ff820caceb0c /config | |
| parent | ae8c7b75e252a83f33c7dac52d1ee0d28aa53e71 (diff) | |
windows.config: Use MinGW Perl instead of MSYS Perl
It seems like MSYS Perl sometimes hangs on the Windows CI runners and
causes the cerbero build jobs to hang. Maybe the MinGW Perl won't hang
because it's not ancient.
Some recipes such as autoconf and automake fail to build when using
the newer Perl, so continue to use the MSYS perl for those.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/616>
Diffstat (limited to 'config')
| -rw-r--r-- | config/windows.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/windows.config b/config/windows.config index 5fa09e9a..7412bbba 100644 --- a/config/windows.config +++ b/config/windows.config @@ -167,6 +167,11 @@ env['PERL'] = 'perl' env['GENDEF'] = 'gendef' env['DLLTOOL'] = cmd('dlltool', dlltool_flags).get() +# MinGW Perl PATH, only needed when building on Windows with MSYS +if platform == Platform.WINDOWS: + perlbin = os.path.join(mingw_perl_prefix, 'bin') + env['PATH'] = '%s%s%s' % (perlbin, separator, env['PATH']) + # MinGW toolchain PATH toolchainbin = os.path.join(toolchain_prefix, 'bin') if toolchainbin not in env['PATH']: |