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>

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 559713a627974443217e42a010e8fed4403bafcd..937c857a1cdf7f1e7665fb76e63e67b4f6054512 100755 (executable)
--- 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