diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-06-27 12:48:44 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | b01bcb34a3c794436537c7752548995311ec6c38 (patch) | |
| tree | 14364b8f73ba4c572ce88f859ee7adf3a980a773 /tools | |
| parent | f8500eb8c1bfc799b38d536e5056f9bb39c89f29 (diff) | |
| download | dbus-b01bcb34a3c794436537c7752548995311ec6c38.tar.gz | |
CI: Ensure that subprojects (if used) are on the Wine PATH
If we are not using Meson subprojects, this will have no practical
effect, because the directories won't exist.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 559713a6..937c857a 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -242,7 +242,16 @@ case "$ci_host" in if [ "$ci_runtime" = "shared" ]; then libgcc_path=$(dirname "$("${ci_host}-gcc" -print-libgcc-file-name)") fi - init_wine "${dep_prefix}/bin" "${builddir}/bin" ${libgcc_path:+"$libgcc_path"} + init_wine \ + "${builddir}/bin" \ + "${builddir}/subprojects/expat-2.4.8" \ + "${builddir}/subprojects/glib-2.72.2/gio" \ + "${builddir}/subprojects/glib-2.72.2/glib" \ + "${builddir}/subprojects/glib-2.72.2/gmodule" \ + "${builddir}/subprojects/glib-2.72.2/gobject" \ + "${builddir}/subprojects/glib-2.72.2/gthread" \ + "${dep_prefix}/bin" \ + ${libgcc_path:+"$libgcc_path"} fi ;; esac |