fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 20:27:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI: Ensure that subprojects (if used) are on the Wine PATH

Browse source 
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>
This commit is contained in:
Simon McVittie 2022-06-27 12:48:44 +01:00
parent f8500eb8c1
commit b01bcb34a3
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/ci-build.sh
View file

@ -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