diff options
| author | Dylan Baker <[email protected]> | 2019-10-11 09:21:17 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-10-16 23:26:09 +0000 |
| commit | 6e375ff1aa0a14fa71b8d983409e27fac610bd50 (patch) | |
| tree | 71d5a20fa79861d4ecfbf9bb6ef29549904c5923 /.gitlab-ci/x86_64-w64-mingw32 | |
| parent | 4441da00448df0700e4424900091ebbdaa6a3c4f (diff) | |
gitlab-ci: Add a pkg-config for mingw
The one debian provides is broken in buster+, so I've just written my
own. This allows meson to find the installed zlib and prevents it from
falling back to wraps.
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to '.gitlab-ci/x86_64-w64-mingw32')
| -rw-r--r-- | .gitlab-ci/x86_64-w64-mingw32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/x86_64-w64-mingw32 b/.gitlab-ci/x86_64-w64-mingw32 index f4346c8f624..4db606e2bf7 100644 --- a/.gitlab-ci/x86_64-w64-mingw32 +++ b/.gitlab-ci/x86_64-w64-mingw32 @@ -3,7 +3,7 @@ c = ['ccache', 'x86_64-w64-mingw32-gcc'] cpp = ['ccache', 'x86_64-w64-mingw32-g++'] ar = 'x86_64-w64-mingw32-ar' strip = 'x86_64-w64-mingw32-strip' -pkgconfig = 'x86_64-w64-mingw32-pkg-config' +pkgconfig = '/usr/local/bin/x86_64-w64-mingw32-pkg-config' windres = 'x86_64-w64-mingw32-windres' exe_wrapper = ['wine64'] |